From 72237811609cd0cff02d3762554c49d8fef7dea4 Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Tue, 30 Dec 2025 18:26:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E8=AF=A6=E6=83=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../circle/other/app/command/family/FamilyBaseInfoExe.java | 7 +++++++
 1 file changed, 7 insertions(+)

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 e1b598b0..fcb968f6 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
@@ -60,6 +60,9 @@ public class FamilyBaseInfoExe {
   public FamilyBaseInfoCO execute(FamilyBaseInfoQueryCmd cmd) {
 
     FamilyBaseInfo baseInfo = getFamilyBaseInfo(cmd);
+    if (Objects.isNull(baseInfo)) {
+      return null;
+    }
 
     FamilyDetailsDTO familyLevel = familyCommon.getFamilyDetails(cmd.getReqSysOrigin().getOrigin(), baseInfo.getId());
     FamilyMemberInfo familyMemberInfo = familyMemberInfoService.getAdmin(cmd.getFamilyId(), FamilyRoleEnum.ADMIN.getKey());
@@ -136,6 +139,10 @@ public class FamilyBaseInfoExe {
     FamilyBaseInfo familyBaseInfo;
     if (cmd.getFamilyId() == null) {
       FamilyMemberInfo familyMemberInfo = familyMemberInfoService.getFamilyMemberByUserId(cmd.getReqUserId());
+      if (familyMemberInfo == null) {
+        return null;
+      }
+
       familyBaseInfo = familyBaseInfoService.getBaseInfoById(familyMemberInfo.getFamilyId());
     } else {
       familyBaseInfo = familyBaseInfoService.getBaseInfoById(cmd.getFamilyId());