Merge branch 'fu-dev' of uskycloud/usky-cloud into system-165

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/controller/web/SysDeptController.java

@@ -6,8 +6,10 @@ import com.usky.common.core.exception.BusinessErrorCode;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.system.domain.SysDept;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.service.ISysDeptService;
+import com.usky.system.service.ISysUserService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -21,22 +23,23 @@ import java.util.Map;
 
 /**
  * 部门信息
- * 
+ *
  * @author yq
  */
 @RestController
 @RequestMapping("/dept")
-public class SysDeptController extends BaseController
-{
+public class SysDeptController extends BaseController {
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private ISysUserService iSysUserService;
+
     /**
      * 获取部门列表
      */
     @GetMapping("/list")
-    public ApiResult list(SysDept dept)
-    {
+    public ApiResult list(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return ApiResult.success(depts);
     }
@@ -45,16 +48,13 @@ public class SysDeptController extends BaseController
      * 查询部门列表（排除节点）
      */
     @GetMapping("/list/exclude/{deptId}")
-    public ApiResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId)
-    {
+    public ApiResult excludeChild(@PathVariable(value = "deptId", required = false) Long deptId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
         Iterator<SysDept> it = depts.iterator();
-        while (it.hasNext())
-        {
+        while (it.hasNext()) {
             SysDept d = (SysDept) it.next();
             if (d.getDeptId().intValue() == deptId
-                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + ""))
-            {
+                    || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")) {
                 it.remove();
             }
         }
@@ -65,8 +65,7 @@ public class SysDeptController extends BaseController
      * 根据部门编号获取详细信息
      */
     @GetMapping(value = "/{deptId}")
-    public ApiResult getInfo(@PathVariable Long deptId)
-    {
+    public ApiResult getInfo(@PathVariable Long deptId) {
         return ApiResult.success(deptService.selectDeptById(deptId));
     }
 
@@ -74,20 +73,28 @@ public class SysDeptController extends BaseController
      * 获取部门下拉树列表
      */
     @GetMapping("/treeselect")
-    public ApiResult treeselect(SysDept dept)
-    {
+    public ApiResult treeselect(SysDept dept) {
         List<SysDept> depts = deptService.selectDeptList(dept);
         return ApiResult.success(deptService.buildDeptTreeSelect(depts));
     }
 
+    /**
+     * 获取部门下拉树列表
+     */
+    @GetMapping("/deptUserTreeSelect")
+    public ApiResult treeselect(SysDept dept, SysUser user) {
+        List<SysDept> depts = deptService.selectDeptList(dept);
+        List<SysUser> users = iSysUserService.selectUserList(user);
+        return ApiResult.success(deptService.buildDeptUserTreeSelect(depts, users));
+    }
+
     /**
      * 加载对应角色部门列表树
      */
     @GetMapping(value = "/roleDeptTreeselect/{roleId}")
-    public ApiResult roleDeptTreeselect(@PathVariable("roleId") Long roleId)
-    {
+    public ApiResult roleDeptTreeselect(@PathVariable("roleId") Long roleId) {
         List<SysDept> depts = deptService.selectDeptList(new SysDept());
-        Map<String,Object> ajax = new HashMap<>();
+        Map<String, Object> ajax = new HashMap<>();
         ajax.put("checkedKeys", deptService.selectDeptListByRoleId(roleId));
         ajax.put("depts", deptService.buildDeptTreeSelect(depts));
         return ApiResult.success(ajax);
@@ -97,10 +104,8 @@ public class SysDeptController extends BaseController
      * 新增部门
      */
     @PostMapping
-    public ApiResult add(@Validated @RequestBody SysDept dept)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
+    public ApiResult add(@Validated @RequestBody SysDept dept) {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setTenantId(SecurityUtils.getTenantId());
@@ -112,19 +117,13 @@ public class SysDeptController extends BaseController
      * 修改部门
      */
     @PutMapping
-    public ApiResult edit(@Validated @RequestBody SysDept dept)
-    {
-        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept)))
-        {
+    public ApiResult edit(@Validated @RequestBody SysDept dept) {
+        if (UserConstants.NOT_UNIQUE.equals(deptService.checkDeptNameUnique(dept))) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改部门'" + dept.getDeptName() + "'失败，部门名称已存在");
-        }
-        else if (dept.getParentId().equals(dept.getDeptId()))
-        {
+        } else if (dept.getParentId().equals(dept.getDeptId())) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "修改部门'" + dept.getDeptName() + "'失败，上级部门不能是自己");
-        }
-        else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
-                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0)
-        {
+        } else if (StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus())
+                && deptService.selectNormalChildrenDeptById(dept.getDeptId()) > 0) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "该部门包含未停用的子部门！");
         }
         dept.setUpdateBy(SecurityUtils.getUsername());
@@ -135,14 +134,11 @@ public class SysDeptController extends BaseController
      * 删除部门
      */
     @DeleteMapping("/{deptId}")
-    public ApiResult remove(@PathVariable Long deptId)
-    {
-        if (deptService.hasChildByDeptId(deptId))
-        {
+    public ApiResult remove(@PathVariable Long deptId) {
+        if (deptService.hasChildByDeptId(deptId)) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "存在下级部门,不允许删除");
         }
-        if (deptService.checkDeptExistUser(deptId))
-        {
+        if (deptService.checkDeptExistUser(deptId)) {
             return ApiResult.error(BusinessErrorCode.BIZ_BUSINESS_ERROR.getCode(), "部门存在用户,不允许删除");
         }
         return toAjax(deptService.deleteDeptById(deptId));

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/ISysDeptService.java

@@ -3,6 +3,7 @@ package com.usky.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.usky.system.domain.SysDept;
+import com.usky.system.domain.SysUser;
 import com.usky.system.service.vo.TreeSelect;
 
 import java.util.List;
@@ -38,6 +39,8 @@ public interface ISysDeptService extends IService<SysDept>
      */
     public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts);
 
+    List<TreeSelect> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users);
+
     /**
      * 根据角色ID查询部门树信息
      * 

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java

@@ -9,6 +9,7 @@ import com.usky.common.core.util.Convert;
 import com.usky.common.core.util.StringUtils;
 import com.usky.system.domain.SysDept;
 import com.usky.system.domain.SysRole;
+import com.usky.system.domain.SysUser;
 import com.usky.system.domain.constants.UserConstants;
 import com.usky.system.mapper.SysDeptMapper;
 import com.usky.system.mapper.SysRoleMapper;
@@ -97,6 +98,31 @@ public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDe
         return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
+    @Override
+    public List<TreeSelect> buildDeptUserTreeSelect(List<SysDept> depts, List<SysUser> users) {
+        List<SysDept> deptTrees = buildDeptTree(depts);
+        List<TreeSelect> treeSelectList = new ArrayList<>();
+        for (SysDept dept : deptTrees) {
+            TreeSelect treeSelect = new TreeSelect();
+            treeSelect.setId(dept.getDeptId());
+            treeSelect.setLabel(dept.getDeptName());
+            List<TreeSelect> children = new ArrayList<>();
+            for (SysUser user : users) {
+                if (user.getDeptId().equals(dept.getDeptId())) {
+                    TreeSelect child = new TreeSelect();
+                    child.setId(user.getUserId());
+                    child.setLabel(user.getNickName());
+                    children.add(child);
+                }
+            }
+            treeSelect.setChildren(children);
+            treeSelectList.add(treeSelect);
+        }
+        return treeSelectList;
+    }
+
+
+
     /**
      * 根据角色ID查询部门树信息
      *