From e203815cff1a75567b6241c774877df871f0b413 Mon Sep 17 00:00:00 2001
From: khalil <842328916@qq.com>
Date: Thu, 16 Oct 2025 14:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F-=E7=BB=93=E7=AE=97-=E6=8C=89?=
 =?UTF-8?q?=E5=91=A8=E6=9C=9F=E6=97=B6=E9=97=B4=E5=86=85=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9C=89=E6=95=88=E5=85=AC=E4=BC=9A=E6=88=90=E5=91=98-sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accompany/sqlmappers/FamilyGiftRecordMapper.xml   |  2 +-
 .../accompany/sqlmappers/FamilyMemberMapper.xml       | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyGiftRecordMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyGiftRecordMapper.xml
index ce52cebb8..3c92be5fc 100644
--- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyGiftRecordMapper.xml
+++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyGiftRecordMapper.xml
@@ -187,7 +187,7 @@
         </where>
         GROUP BY
         gm.family_id,
-        gm.uid
+        gm.id
         order by goldIncome desc, gm.enable desc
     </select>
 
diff --git a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyMemberMapper.xml b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyMemberMapper.xml
index 95d6b9d3a..7a0d36675 100644
--- a/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyMemberMapper.xml
+++ b/accompany-business/accompany-business-service/src/main/resources/accompany/sqlmappers/FamilyMemberMapper.xml
@@ -19,14 +19,19 @@
     </select>
 
     <select id="listValidFamilyMemberByTime" resultType="com.accompany.business.model.family.FamilyMember">
-        select max(id) `id`, family_id, uid, role_type, create_time, update_time, enable
+        select fm.`id`, family_id, uid, role_type, create_time, update_time, enable
+        from family_member fm
+        inner join (
+        select max(id) `id`
         from family_member fm
         where 1=1
         <if test="familyId != null">
             and fm.family_id = #{familyId}
         </if>
-        and (fm.enable = 1 or (fm.update_time between #{startTime} and #{endTime}))
-        group by uid, family_id
+        and fm.family_id = 11
+        and (fm.enable = 1 or (fm.update_time between '2025-10-01 00:00:00' and '2025-10-15 23:59:59'))
+        group by family_id, uid
+        ) fmm on fm.id = fmm.id
         order by role_type asc , enable desc, create_time asc
     </select>