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());