From d80f94ecc7e8b9912d43de1f483a9da4da30c7d5 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Fri, 26 Dec 2025 18:01:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/command/family/FamilyHomeListExe.java | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyHomeListExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyHomeListExe.java
index 5bd87303..089d4aa5 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyHomeListExe.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyHomeListExe.java
@@ -26,11 +26,7 @@ import com.red.circle.other.inner.model.dto.famliy.FamilyDetailsDTO;
 import com.red.circle.tool.core.collection.CollectionUtils;
 import com.red.circle.tool.core.num.NumUtils;
 import java.math.BigDecimal;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -54,7 +50,7 @@ public class FamilyHomeListExe {
 
   public PageResult<FamilyHomeListCO> execute(FamilyHomeListCmd cmd) {
     List<FamilyBaseInfo> familyList = getFamilyList(cmd);
-    
+
     if (CollectionUtils.isEmpty(familyList)) {
       return PageResult.newPageResult(0);
     }
@@ -87,18 +83,12 @@ public class FamilyHomeListExe {
   }
 
   private List<FamilyBaseInfo> getFamilyList(FamilyHomeListCmd cmd) {
-    IPage<FamilyBaseInfo> page = new Page<>();
-    page.setCurrent(cmd.getCurrent());
-    page.setSize(cmd.getSize());
+    FamilyMemberInfo familyMemberInfo = familyMemberInfoService.getFamilyMemberByUserId(cmd.getReqUserId());
+    if (familyMemberInfo == null) {
+      return Collections.emptyList();
+    }
 
-    return familyBaseInfoService.page(
-            page,
-            familyBaseInfoService.query()
-                    .eq(FamilyBaseInfo::getSysOrigin, cmd.requireReqSysOrigin())
-                    .eq(FamilyBaseInfo::getFamilyStatus, FamilyStatusEnum.NORMAL.name())
-                    .orderByDesc(FamilyBaseInfo::getCreateTime)
-                    .getWrapper()
-    ).getRecords();
+    return List.of(familyBaseInfoService.getBaseInfoById(familyMemberInfo.getId()));
   }
 
   private FamilyHomeListCO buildFamilyHomeCO(FamilyHomeListCmd cmd, FamilyBaseInfo family, BigDecimal totalExp) {
@@ -119,7 +109,7 @@ public class FamilyHomeListExe {
 
     List<FamilyHomeMemberCO> displayMembers = buildDisplayMembers(cmd, members, onlineUserIds);
 
-    List<ActiveVoiceRoom> onlineRooms = activeVoiceRoomService.listByFamilyId(family.getId(), 4);
+    List<ActiveVoiceRoom> onlineRooms = activeVoiceRoomService.listByFamilyId(family.getId(), 30);
     List<FamilyHomeRoomCO> roomCOs = buildRoomCOs(onlineRooms);
 
     return new FamilyHomeListCO()