From 5c90666f0c5efca9fd5204185390ee8adda2f7e1 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Tue, 30 Dec 2025 17:58:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E8=AF=A6=E6=83=85=E6=A0=B9?=
 =?UTF-8?q?=E6=8D=AE=E8=87=AA=E5=B7=B1=E5=BE=97=E5=AE=B6=E6=97=8F=E5=8E=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../other/app/command/family/FamilyBaseInfoExe.java      | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyBaseInfoExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyBaseInfoExe.java
index 0e196b38..e1b598b0 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyBaseInfoExe.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyBaseInfoExe.java
@@ -133,7 +133,14 @@ public class FamilyBaseInfoExe {
   }
 
   private FamilyBaseInfo getFamilyBaseInfo(FamilyBaseInfoQueryCmd cmd) {
-    FamilyBaseInfo familyBaseInfo = familyBaseInfoService.getBaseInfoById(cmd.getFamilyId());
+    FamilyBaseInfo familyBaseInfo;
+    if (cmd.getFamilyId() == null) {
+      FamilyMemberInfo familyMemberInfo = familyMemberInfoService.getFamilyMemberByUserId(cmd.getReqUserId());
+      familyBaseInfo = familyBaseInfoService.getBaseInfoById(familyMemberInfo.getFamilyId());
+    } else {
+      familyBaseInfo = familyBaseInfoService.getBaseInfoById(cmd.getFamilyId());
+    }
+
     ResponseAssert.notNull(CommonErrorCode.NOT_FOUND_RECORD_INFO, familyBaseInfo);
     ResponseAssert.isTrue(CommonErrorCode.NOT_FOUND_RECORD_INFO, Objects
         .equals(FamilyStatusEnum.NORMAL.name(), familyBaseInfo.getFamilyStatus()));