diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/DisbandFamilyCmdExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/DisbandFamilyCmdExe.java index f2109b66..ea928022 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/DisbandFamilyCmdExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/DisbandFamilyCmdExe.java @@ -61,11 +61,11 @@ public class DisbandFamilyCmdExe { Long familyId = memberInfo.getFamilyId(); FamilyBaseInfo familyBaseInfo = familyBaseInfoService.getBaseInfoById(familyId); ResponseAssert.notNull(FamilyErrorCode.NOT_EXIST_FAMILY_INFO_DATA, familyBaseInfo); + List allMembers = familyMemberInfoService.listByFamilyId(familyId); clearFamilyData(familyId); disbandFamilyStatus(familyId); - List allMembers = familyMemberInfoService.listByFamilyId(familyId); notifyAllMembers(allMembers, familyId); allMembers.forEach(member -> { @@ -74,9 +74,9 @@ public class DisbandFamilyCmdExe { } private void clearFamilyData(Long familyId) { - + familyMemberInfoService.deleteByFamilyId(familyId); - + familyWeekExpService.deleteByFamilyId(familyId); familyMonthExpService.deleteByFamilyId(familyId); familyLevelExpService.deleteByFamilyId(familyId);