Explorar el Código

fix: 查询全可用的用户

shc hace 3 años
padre
commit
54f9069a36

+ 49 - 0
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysUserController.java

@@ -19,6 +19,7 @@
 
 package com.qunzhixinxi.hnqz.admin.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdcardUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.bean.BeanUtil;
@@ -48,6 +49,7 @@ import com.qunzhixinxi.hnqz.admin.service.SysDeptService;
 import com.qunzhixinxi.hnqz.admin.service.SysUserService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaAgentService;
 import com.qunzhixinxi.hnqz.admin.service.WmDaDrugEntService;
+import com.qunzhixinxi.hnqz.common.core.constant.CommonConstants;
 import com.qunzhixinxi.hnqz.common.core.util.R;
 import com.qunzhixinxi.hnqz.common.ding.service.DingService;
 import com.qunzhixinxi.hnqz.common.log.annotation.SysLog;
@@ -1510,6 +1512,53 @@ public class SysUserController {
 		}
 	}
 
+	/**
+	 * 查询全可用的用户
+	 *
+	 * @param userDTO userDTO
+	 * @return success/false
+	 */
+	@SysLog("查询全可用的用户")
+	@GetMapping("/list/available")
+	public R listScope1(Page page, UserDTO userDTO) {
+		userDTO.setLockFlag(CommonConstants.STATUS_NORMAL);
+		if (CollUtil.isNotEmpty(userDTO.getRole())) {
+			userDTO.setDeptId(SecurityUtils.getUser().getDeptId());
+			page.setSize(10000);
+			List<UserVO> sysUserList = userService.getUsersWithRolePage(page, userDTO).getRecords();
+			List<Map<String, String>> answerList = new ArrayList<>();
+			if (sysUserList.size() > 0) {
+				for (UserVO sysUser : sysUserList) {
+					Map<String, String> map = new HashMap<>();
+					map.put("id", sysUser.getUserId() + "");
+					map.put("realname", sysUser.getRealname() + "");
+					answerList.add(map);
+				}
+
+			}
+			return R.ok(answerList);
+		} else {
+			page.setSize(10000);
+			List<Integer> list = new ArrayList<>();
+			list.add(5);
+			list.add(6);
+			userDTO.setRole(list);
+
+			List<UserVO> sysUserList = userService.getUsersWithRolePage(page, userDTO).getRecords();
+			List<Map<String, String>> answerList = new ArrayList<>();
+			if (sysUserList.size() > 0) {
+				for (UserVO sysUser : sysUserList) {
+					Map<String, String> map = new HashMap<>();
+					map.put("id", sysUser.getUserId() + "");
+					map.put("realname", sysUser.getRealname() + "");
+					answerList.add(map);
+				}
+
+			}
+			return R.ok(answerList);
+		}
+	}
+
 	/**
 	 * 查询用户列表
 	 *