Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/controller/SysDeptController.java

@@ -1,5 +1,6 @@
 package com.ydtech.modules.admin.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.ydtech.core.page.HttpResult;
 import com.ydtech.core.page.PageRequest;
 import com.ydtech.modules.admin.model.SysDept;
@@ -46,9 +47,14 @@ public class SysDeptController extends BaseController {
     //@PreAuthorize("hasAuthority('sys:dept:view')")
     @ApiOperation(value = "获取树结构")
     @GetMapping(value = "/findTree")
-    public HttpResult<List<SysDept>> findTree(String deptId,String managementSource) {
-        SysUser user = getUser();
-//        String deptId = user.getDeptId();
+    public HttpResult<List<SysDept>> findTree() {
+        BaseController baseController = new BaseController();
+        String deptId = baseController.getDeptId();
+        LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(SysDept::getDelFlag, 0).eq(SysDept::getId, deptId);
+        SysDept one = sysDeptService.getOne(queryWrapper);
+        String managementSource = one.getManagementSource();
+
         return HttpResult.ok(sysDeptService.findTree(deptId,managementSource));
     }
 
@@ -71,13 +77,7 @@ public class SysDeptController extends BaseController {
         return HttpResult.ok(sysDeptService.removeByIds(records));
     }
 
-    @GetMapping(value = "/findLeftDeptTree")
-    public HttpResult findLeftDeptTree(String deptCode) {
-        if (deptCode.contains("D")) {
-            deptCode = deptCode.substring(0, deptCode.indexOf("D"));
-        }
-        return HttpResult.ok(sysDeptService.selectListTreeSysDeptVO(deptCode));
-    }
+
 
     ////    @PreAuthorize("hasAuthority('sys:dept:view')")
     @PostMapping(value = "/findSubDept")

src/main/java/com/ydtech/modules/admin/service/SysDeptService.java

@@ -13,13 +13,6 @@ import java.util.List;
 
 public interface SysDeptService extends IService<SysDept> {
 
-    /**
-     * 查找自已有权限的部门树
-     *
-     * @param deptCode
-     * @return
-     */
-    List<TreeSysDeptVO> selectListTreeSysDeptVO(String deptCode);
 
     //
     PageResult findSubDepts(PageRequest pageRequest);

src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -186,33 +186,6 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
     }
 
 
-    //查找自已有权限的部门树
-    public List<TreeSysDeptVO> selectListTreeSysDeptVO(String id) {
-        if (id == null) {
-            id = "";
-        }
-        LambdaQueryWrapper<SysDept> lqw = new LambdaQueryWrapper<>();
-
-        lqw.like(StringUtils.isNotEmpty(id), SysDept::getId, id);
-        List<SysDept> deptList = list(lqw);
-        List<TreeSysDeptVO> recordList = new ArrayList<>();
-
-        deptList.forEach(a -> {
-            TreeSysDeptVO model = new TreeSysDeptVO();
-            model.setId(a.getId());
-            model.setName(a.getName());
-            model.setParentId(a.getParentId());
-            model.setDeptCode(a.getDeptCode());
-            model.setProvince(a.getProvince());
-            model.setCity(a.getCity());
-            model.setArea(a.getArea());
-            model.setComlevel(a.getComlevel());
-            recordList.add(model);
-        });
-
-        return recordList;
-    }
-
 
     public String findMaxDeptId(String deptId) {
         if (deptId == null) return "";