修改家族树，修改家族管理

ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TbFamilyMemberController.java

@@ -50,7 +50,7 @@ public class TbFamilyMemberController extends BaseController {
     /**
      * 查询家族成员列表
      */
-    @ApiOperation("查询家族成员列表")
+    @ApiOperation("查询家族成员分页列表")
     @PreAuthorize("@ss.hasPermi('system:member:list')")
     @GetMapping("/list")
     public TableDataInfo list(AppMemberVo memberVo) {
@@ -59,6 +59,27 @@ public class TbFamilyMemberController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 查询成员列表
+     */
+    @ApiOperation("查询家族成员列表")
+    @PreAuthorize("@ss.hasPermi('system:member:list')")
+    @GetMapping("/memberList")
+    public AjaxResult memberList(AppMemberVo memberVo) {
+        List<AppMemberVo> list = iTbFamilyMemberService.selectFamilyMember(memberVo);
+        return AjaxResult.success(list);
+    }
+    /**
+     * 查询未在家族树的成员列表
+     */
+    @ApiOperation("查询未在家族树的成员列表")
+    @PreAuthorize("@ss.hasPermi('system:member:list')")
+    @GetMapping("/notTreeList")
+    public AjaxResult notTreeList(AppMemberVo memberVo) {
+        List<AppMemberVo> list = iTbFamilyMemberService.selectMemberNotTree(memberVo);
+        return AjaxResult.success(list);
+    }
+
     @ApiOperation("查询家族树 列表")
     @PreAuthorize("@ss.hasPermi('system:member:list')")
     @GetMapping("/treeList")

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

@@ -10,6 +10,7 @@ import com.ruoyi.app.domain.TbAppUser;
 import com.ruoyi.app.domain.TbFamily;
 import com.ruoyi.app.domain.TbFamilyMember;
 import com.ruoyi.app.domain.TbMemberMiddle;
+import com.ruoyi.app.domain.vo.AppFamilyVo;
 import com.ruoyi.app.domain.vo.AppMemberVo;
 import com.ruoyi.app.service.ITbAppUserService;
 import com.ruoyi.app.service.ITbFamilyService;
@@ -18,6 +19,7 @@ import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.bean.BeanUtils;
 import com.ruoyi.common.utils.spring.SpringUtils;
 import io.swagger.annotations.Api;
@@ -55,6 +57,36 @@ public class FamilyController extends AppBaseController {
     private final ITbMemberMiddleService middleService;
 
     /**
+     * 查询家族列表
+     */
+    @ApiOperation("查询家族列表")
+    @GetMapping("/list")
+    public TableDataInfo list(TbFamily tbFamily)
+    {
+        startPage();
+        LambdaQueryWrapper<TbFamily> lqw = new LambdaQueryWrapper<>();
+        if (StringUtils.isNotBlank(tbFamily.getCode())){
+            lqw.eq(TbFamily::getCode ,tbFamily.getCode());
+        }
+        if (StringUtils.isNotBlank(tbFamily.getName())){
+            lqw.like(TbFamily::getName ,tbFamily.getName());
+        }
+        if (StringUtils.isNotBlank(tbFamily.getFullName())){
+            lqw.like(TbFamily::getFullName ,tbFamily.getFullName());
+        }
+        if (StringUtils.isNotBlank(tbFamily.getHometown())){
+            lqw.eq(TbFamily::getHometown ,tbFamily.getHometown());
+        }
+        if (StringUtils.isNotBlank(tbFamily.getAddress())){
+            lqw.eq(TbFamily::getAddress ,tbFamily.getAddress());
+        }
+        if (StringUtils.isNotBlank(tbFamily.getCity())){
+            lqw.eq(TbFamily::getCity ,tbFamily.getCity());
+        }
+        List<AppFamilyVo> list = familyService.pageList(lqw);
+        return getDataTable(list);
+    }
+    /**
      * 查询我的默认家族
      */
     @ApiOperation("我的默认家族")

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

@@ -20,6 +20,7 @@ public interface ITbFamilyMemberService extends IService<TbFamilyMember> {
     boolean saveOrUpdate(AppMemberVo memberVo);
     List<AppMemberVo> selectFamilyMember(AppMemberVo memberVo);
     List<AppMemberVo> selectFamilyTree(AppMemberVo memberVo);
+    List<AppMemberVo> selectMemberNotTree(AppMemberVo memberVo);
     TbMemberMiddle getFamilyTree(Long familyId);
     boolean addFamilyTree(TbMemberMiddle member);
     AjaxResult delMember(String familyId, Long[] ids);

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

@@ -166,6 +166,25 @@ public class TbFamilyMemberServiceImpl extends ServiceImpl<TbFamilyMemberMapper,
     }
 
     @Override
+    public List<AppMemberVo> selectMemberNotTree(AppMemberVo memberVo) {
+        TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), AppMemberVo.class);
+
+        LambdaQueryWrapper<AppMemberVo> lqw = new LambdaQueryWrapper<>();
+        if (memberVo.getFamilyId() == null) {
+            return new ArrayList<>();
+        }
+        lqw.eq(AppMemberVo::getFamilyId, memberVo.getFamilyId());
+        lqw.isNull(AppMemberVo::getParentId);
+        if (StringUtils.isNotBlank(memberVo.getSearchValue())) {
+            lqw.and(
+                    i -> i.like(AppMemberVo::getName,memberVo.getSearchValue()).or()
+                            .like(AppMemberVo::getMobile,memberVo.getSearchValue())
+            );
+        }
+        return baseMapper.selectFamilyMember(lqw);
+    }
+
+    @Override
     public TbMemberMiddle getFamilyTree(Long familyId){
 
         return getChildNode(zeroParent(familyId),allList(familyId));