feat: 查询部门 tree 支持过滤部门名

cadecode · Nov 26, 2023 · 87dd2b1 · 87dd2b1
1 parent 4657039
commit 87dd2b1
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/...mework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/bean/vo/SysDeptVo.java b/...mework_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/bean/vo/SysDeptVo.java
@@ -15,6 +15,11 @@
  */
 public class SysDeptVo {
 
+    @Data
+    public static class SysDeptTreeReqVo {
+        private String deptName;
+    }
+
     @Data
     public static class SysDeptTreeResVo {
         private Long id;

diff --git a/...src/main/java/com/github/cadecode/uniboot/framework/svc/controller/SysDeptController.java b/...src/main/java/com/github/cadecode/uniboot/framework/svc/controller/SysDeptController.java
@@ -2,10 +2,7 @@
 
 import com.github.cadecode.uniboot.framework.base.annotation.ApiFormat;
 import com.github.cadecode.uniboot.framework.svc.bean.po.SysDept;
-import com.github.cadecode.uniboot.framework.svc.bean.vo.SysDeptVo.SysDeptAddReqVo;
-import com.github.cadecode.uniboot.framework.svc.bean.vo.SysDeptVo.SysDeptQueryResVo;
-import com.github.cadecode.uniboot.framework.svc.bean.vo.SysDeptVo.SysDeptTreeResVo;
-import com.github.cadecode.uniboot.framework.svc.bean.vo.SysDeptVo.SysDeptUpdateReqVo;
+import com.github.cadecode.uniboot.framework.svc.bean.vo.SysDeptVo.*;
 import com.github.cadecode.uniboot.framework.svc.convert.SysDeptConvert;
 import com.github.cadecode.uniboot.framework.svc.service.SysDeptService;
 import io.swagger.annotations.Api;
@@ -44,8 +41,8 @@ public class SysDeptController {
 
     @ApiOperation("查询部门列表（树状）")
     @PostMapping("list_tree_vo")
-    public List<SysDeptTreeResVo> listTreeVo() {
-        return sysDeptService.listTreeVo();
+    public List<SysDeptTreeResVo> listTreeVo(@RequestBody @Valid SysDeptTreeReqVo reqVo) {
+        return sysDeptService.listTreeVo(reqVo);
     }
 
     @ApiOperation("更新部门")

diff --git a/...k_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/service/SysDeptService.java b/...k_svc/src/main/java/com/github/cadecode/uniboot/framework/svc/service/SysDeptService.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.github.cadecode.uniboot.framework.svc.bean.po.SysDept;
+import com.github.cadecode.uniboot.framework.svc.bean.vo.SysDeptVo.SysDeptTreeReqVo;
 import com.github.cadecode.uniboot.framework.svc.bean.vo.SysDeptVo.SysDeptTreeResVo;
 
 import java.util.List;
@@ -14,5 +15,5 @@
  */
 public interface SysDeptService extends IService<SysDept> {
 
-    List<SysDeptTreeResVo> listTreeVo();
+    List<SysDeptTreeResVo> listTreeVo(SysDeptTreeReqVo reqVo);
 }
diff --git a/...c/main/java/com/github/cadecode/uniboot/framework/svc/serviceimpl/SysDeptServiceImpl.java b/...c/main/java/com/github/cadecode/uniboot/framework/svc/serviceimpl/SysDeptServiceImpl.java
@@ -3,6 +3,7 @@
 import cn.hutool.core.util.ObjUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.cadecode.uniboot.framework.svc.bean.po.SysDept;
+import com.github.cadecode.uniboot.framework.svc.bean.vo.SysDeptVo.SysDeptTreeReqVo;
 import com.github.cadecode.uniboot.framework.svc.bean.vo.SysDeptVo.SysDeptTreeResVo;
 import com.github.cadecode.uniboot.framework.svc.convert.SysDeptConvert;
 import com.github.cadecode.uniboot.framework.svc.mapper.SysDeptMapper;
@@ -22,8 +23,11 @@
 @Service
 public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> implements SysDeptService {
     @Override
-    public List<SysDeptTreeResVo> listTreeVo() {
-        List<SysDept> poList = list().stream()
+    public List<SysDeptTreeResVo> listTreeVo(SysDeptTreeReqVo reqVo) {
+        List<SysDept> poList = lambdaQuery()
+                .likeRight(ObjUtil.isNotEmpty(reqVo.getDeptName()), SysDept::getDeptName, reqVo.getDeptName())
+                .list()
+                .stream()
                 .sorted(Comparator.comparing(SysDept::getOrderNum))
                 .collect(Collectors.toList());
         List<SysDeptTreeResVo> treeResVoList = SysDeptConvert.INSTANCE.poToTreeResVo(poList);