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 8b41eb7d..7481593c 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 @@ -164,7 +164,7 @@ public class FamilyBaseInfoExe { .setLevelBackgroundPicture(familyLevel.getLevelBackgroundPicture()) .setBoxInfo(boxInfo) .setMemberList(memberList) - .setMyFamilyRole(Optional.ofNullable(myFamilyInfo).map(FamilyMemberInfo::getMemberRole).orElse(null)) + .setMyFamilyRole(Optional.ofNullable(myFamilyInfo).filter(e -> e.getFamilyId().equals(baseInfo.getId())).map(FamilyMemberInfo::getMemberRole).orElse(null)) .setJoinWaiting(joinWaiting) ; }