获取部门及用户列表

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/controller/DeptController.java

         return iDeptService.test(id);
     }
 
+    /**
+     * 根据当前登录用户获取部门列表
+     * @return
+     */
+    @GetMapping("/list")
+    public JsonResult list(){
+        return iDeptService.list();
+    }
 
 
 

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/controller/UserController.java

        return iUserService.resetPwd(dto);
    }
 
+    /**
+     * 根据部门id获取用户信息
+     * @return
+     */
+   @GetMapping("/getList")
+    public JsonResult getList(){
+       return iUserService.getList();
+   }
+
 
 
 

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/enums/DataPermissionEnum.java

 
     ALL(1,"查看所有部门数据"),
     DEPT_AND_SUB_DEPT(2,"查看本部门及子部门数据"),
-    DEPT(3,"查看本部门数据");
+    DEPT(3,"查看本部门数据"),
+    DATA_PERMISSION_IS_NOT_EXIST(4,"用户数据权限为空");
 
     DataPermissionEnum(int code, String description){
         this.code = code;

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/IDeptService.java

     JsonResult treeList();
 
     JsonResult test(String id);
+
+    JsonResult list();
 }

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/IUserService.java

     JsonResult getUserInfo();
 
     JsonResult resetPwd(ResetPwdDto dto);
+
+    JsonResult getList();
+
 }

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/DeptServiceImpl.java

 package com.tuoheng.miniprogram.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.tuoheng.common.core.utils.JsonResult;
+import com.tuoheng.common.core.utils.StringUtils;
 import com.tuoheng.miniprogram.dao.DeptMapper;
 import com.tuoheng.miniprogram.entity.Dept;
+import com.tuoheng.miniprogram.entity.User;
+import com.tuoheng.miniprogram.enums.DataPermissionEnum;
+import com.tuoheng.miniprogram.enums.MarkEnum;
+import com.tuoheng.miniprogram.enums.UserCodeEnum;
 import com.tuoheng.miniprogram.service.IDeptService;
+import com.tuoheng.miniprogram.utils.CurrentUserUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.xml.crypto.Data;
 import java.util.*;
 import java.util.stream.Collectors;
 
         return JsonResult.success(list);
     }
 
+    @Override
+    public JsonResult list() {
+        User user = CurrentUserUtil.getUserInfo();
+        String tenantId = user.getTenantId();
+        Integer dataPermission = user.getDataPermission();
+        String deptId = user.getDeptId();
+        if(StringUtils.isEmpty(deptId)){
+            return JsonResult.error("当前用户部门为空");
+        }
+        List<Dept> deptList = new ArrayList<>();
+        if(null == dataPermission){
+            return JsonResult.error(DataPermissionEnum.DATA_PERMISSION_IS_NOT_EXIST.getCode(),
+                    DataPermissionEnum.DATA_PERMISSION_IS_NOT_EXIST.getDescription());
+        }
+        if(DataPermissionEnum.ALL.getCode() == dataPermission){
+            deptList = deptMapper.selectList(Wrappers.<Dept>lambdaQuery()
+                    .eq(Dept::getMark, MarkEnum.VALID.getCode())
+                    .eq(Dept::getTenantId, tenantId));
+        }
+        if(DataPermissionEnum.DEPT_AND_SUB_DEPT.getCode() == dataPermission){
+            //获取当前部门及其子部门
+            List<String> deptIdList = deptMapper.selectAllChildListById(deptId);
+            if(CollectionUtil.isNotEmpty(deptIdList)){
+                for (String id : deptIdList) {
+                    Dept dept = deptMapper.selectById(id);
+                    deptList.add(dept);
+                }
+            }
+        }
+        if(DataPermissionEnum.DEPT.getCode() == dataPermission){
+            //查询当前部门
+            Dept dept = deptMapper.selectById(deptId);
+            deptList.add(dept);
+        }
+
+        return JsonResult.success(deptList);
+    }
+
 
     /**
      * 递归获取部门的子集

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/IUserServiceImpl.java

 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.List;
+
 /**
  * @Author ChengWang
  * @Date 2022/11/21
         }
         return JsonResult.success(UserCodeEnum.PASSWORD_REVISE_SUCCESS.getCode(), UserCodeEnum.PASSWORD_REVISE_SUCCESS.getMsg());
     }
+
+    @Override
+    public JsonResult getList() {
+        User user = CurrentUserUtil.getUserInfo();
+        if(StringUtils.isEmpty(user.getDeptId())){
+            return JsonResult.error("用户部门不存在");
+        }
+        List<User> userList = userMapper.selectList(Wrappers.<User>lambdaQuery()
+                .eq(User::getMark, MarkEnum.VALID.getCode())
+                .eq(User::getDeptId, user.getDeptId())
+                .eq(User::getStatus, 1));
+        return JsonResult.success(userList);
+    }
 }