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