|
|
@@ -629,7 +629,9 @@ public class FamilyMemberService {
|
|
|
|
|
|
/**
|
|
|
* 获取家庭成员列表(含家庭信息),兼容旧接口 /api/family/user/family-members 的 Map 返回结构。
|
|
|
- * 返回: { familyId, familyName, inviteCode, creatorId, parents[], children[] }
|
|
|
+ * 返回: { familyId, familyName, inviteCode, creatorId, parents[], children[], members[] }
|
|
|
+ * members 为富化的 FamilyMemberVO 列表(含 roleLabel/trustScore 等展示字段),
|
|
|
+ * 供前端单次调用 /api/family/member/list?includeFamily=true 同时获取成员与家庭信息,避免重复请求。
|
|
|
*/
|
|
|
public Map<String, Object> listMembersWithFamily(Long userId) {
|
|
|
Map<String, Object> result = new java.util.HashMap<>();
|
|
|
@@ -649,6 +651,7 @@ public class FamilyMemberService {
|
|
|
result.put("familyName", family.getName());
|
|
|
result.put("inviteCode", family.getInviteCode());
|
|
|
result.put("creatorId", family.getCreatorId());
|
|
|
+ result.put("members", listMembers(userId));
|
|
|
result.put("parents", userMapper.selectList(
|
|
|
new LambdaQueryWrapper<User>().eq(User::getFamilyId, familyId).eq(User::getRole, "parent")));
|
|
|
result.put("children", familyMemberMapper.selectList(
|