|
@@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjectUtil;
|
|
|
import com.zjugis.framework.common.enums.CommonStatusEnum;
|
|
|
import com.zjugis.framework.common.pojo.CommonResult;
|
|
|
import com.zjugis.framework.common.util.collection.CollectionUtils;
|
|
|
+import com.zjugis.framework.datapermission.core.annotation.DataPermission;
|
|
|
import com.zjugis.module.system.controller.admin.dept.vo.dept.*;
|
|
|
import com.zjugis.module.system.convert.dept.DeptConvert;
|
|
|
import com.zjugis.module.system.dal.dataobject.dept.DeptDO;
|
|
@@ -126,6 +127,37 @@ public class DeptController {
|
|
|
return success(simpleRespVOList);
|
|
|
}
|
|
|
|
|
|
+ @GetMapping("/list-all-user-simple-permission")
|
|
|
+ @Operation(summary = "获取部门用户精简信息列表-数据权限过滤", description = "只包含被开启的部门,主要用于前端的下拉选项")
|
|
|
+ @DataPermission(enable = true)
|
|
|
+ public CommonResult<List<DeptUserSimpleRespVO>> getPermissionSimpleDeptUserList() {
|
|
|
+ // 获得部门列表,只要开启状态的
|
|
|
+ DeptListReqVO reqVO = new DeptListReqVO();
|
|
|
+ reqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
|
|
|
+ List<DeptDO> list = deptService.getDeptList(reqVO);
|
|
|
+ // 排序后,返回给前端
|
|
|
+ list.sort(Comparator.comparing(DeptDO::getSort));
|
|
|
+ List<DeptUserSimpleRespVO> simpleRespVOList = DeptConvert.INSTANCE.convertList04(list);
|
|
|
+ simpleRespVOList.forEach(deptUserSimpleRespVO -> {
|
|
|
+ deptUserSimpleRespVO.setType("dept");
|
|
|
+ });
|
|
|
+ //获取用户列表,只要开启状态的
|
|
|
+ List<AdminUserDO> userList = userService.getUserListByStatus(CommonStatusEnum.ENABLE.getStatus());
|
|
|
+ userList.forEach(adminUserDO -> {
|
|
|
+ List<String> deptIds = new ArrayList<>();
|
|
|
+ deptIds.add(adminUserDO.getDeptId());
|
|
|
+ if(CollectionUtil.isNotEmpty(adminUserDO.getDeptIds())){
|
|
|
+ deptIds.addAll(adminUserDO.getDeptIds());
|
|
|
+ }
|
|
|
+ deptIds.forEach(deptId -> {
|
|
|
+ DeptUserSimpleRespVO deptUserSimpleRespVO = new DeptUserSimpleRespVO();
|
|
|
+ deptUserSimpleRespVO.setId(adminUserDO.getId()).setParentId(deptId).setName(adminUserDO.getNickname()).setType("user");
|
|
|
+ simpleRespVOList.add(deptUserSimpleRespVO);
|
|
|
+ });
|
|
|
+ });
|
|
|
+ return success(simpleRespVOList);
|
|
|
+ }
|
|
|
+
|
|
|
@GetMapping("/get")
|
|
|
@Operation(summary = "获得部门信息")
|
|
|
@Parameter(name = "id", description = "编号", required = true, example = "1024")
|