修改我的家族成员列表

ruoyi-app/src/main/java/com/ruoyi/app/controller/FamilyMemberController.java

@@ -56,24 +56,12 @@ public class FamilyMemberController extends AppBaseController {
         AppMemberVo memberVo = getLoginUser().getUser();
         // 获取默认家族信息
         TbFamily family = familyService.myFamily(memberVo.getMemberId());
-        // 获取家族关联成员的信息
-        List<TbMemberMiddle> middles = middleService.list(new LambdaQueryWrapper<TbMemberMiddle>()
-            .eq(TbMemberMiddle::getFamilyId, family.getId())
-                .eq(TbMemberMiddle::getStatus,"2")
-        );
-        if (middles.size() <= 0) {
-            return AjaxResult.success();
-        }
-        List<Long> ids = new ArrayList<>();
-        middles.forEach(item -> {
-            ids.add(item.getMemberId());
-        });
-        // 根据家族获取成员信息
 //        pageNum = pageNum == null ? 1 : pageNum;
 //        pageSize = pageSize == null ? 10 : pageSize;
 //        PageHelper.startPage(pageNum, pageSize, "py_first asc");
-        List<TbFamilyMember> list = memberService.list(new LambdaQueryWrapper<TbFamilyMember>()
-            .in(TbFamilyMember::getId, ids)
+        List<AppMemberVo> list = memberService.myMemberList(new LambdaQueryWrapper<AppMemberVo>()
+                .eq(AppMemberVo::getFamilyId,family.getId())
+                .eq(AppMemberVo::getStatus,"2")
         );
         return AjaxResult.success(list);
     }

ruoyi-system/src/main/java/com/ruoyi/app/service/ITbFamilyMemberService.java

@@ -1,5 +1,6 @@
 package com.ruoyi.app.service;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ruoyi.app.domain.TbFamilyMember;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.app.domain.TbMemberMiddle;
@@ -19,6 +20,7 @@ public interface ITbFamilyMemberService extends IService<TbFamilyMember> {
     AppMemberVo get(Long memberId);
     AppMemberVo getMemberDetail(Long familyId, Long memberId);
     boolean saveOrUpdate(AppMemberVo memberVo);
+    List<AppMemberVo> myMemberList(LambdaQueryWrapper<AppMemberVo> lqw);
     List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo);
     List<AppMemberVo> selectFamilyTree(AppMemberVo memberVo);
     List<AppMemberVo> selectMemberNotTree(AppMemberVo memberVo);

ruoyi-system/src/main/java/com/ruoyi/app/service/impl/TbFamilyMemberServiceImpl.java

@@ -174,6 +174,12 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
     }
 
     @Override
+    public List<AppMemberVo> myMemberList(LambdaQueryWrapper<AppMemberVo> lqw){
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
+        return baseMapper.selectFamilyMember(lqw);
+    }
+
+    @Override
     public List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo) {
         TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);