diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyListExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyListExe.java index bbea127b..aa091539 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyListExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/family/FamilyListExe.java @@ -15,6 +15,7 @@ import com.red.circle.other.infra.database.rds.service.family.FamilyMemberInfoSe import com.red.circle.tool.core.collection.CollectionUtils; import java.util.List; import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; @@ -73,7 +74,10 @@ public class FamilyListExe { .setFamilyIntro(family.getFamilyIntro()) .setFamilyNotice(family.getFamilyNotice()) .setCurrentMember(currentMember.intValue()) - .setMaxMember(levelConfig != null ? levelConfig.getMaxMember() : 0); + .setFamilyLevel(Optional.ofNullable(levelConfig.getLevelKey()) + .map(key -> Integer.parseInt(key.substring(6))) + .orElse(0)) + .setMaxMember(levelConfig.getMaxMember()); }).toList(); pageResult.setRecords(records); diff --git a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyListCO.java b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyListCO.java index afe7d484..27819efd 100644 --- a/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyListCO.java +++ b/rc-service/rc-service-other/other-client/src/main/java/com/red/circle/other/app/dto/clientobject/family/FamilyListCO.java @@ -43,6 +43,11 @@ public class FamilyListCO { */ private String familyNotice; + /** + * d + */ + private Integer familyLevel; + /** * 家族当前成员数. */