微调

pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java

@@ -599,14 +599,26 @@ public class UserController extends BaseController {
 
 
     /**
-     * 查询所有用户
+     * 查询所有用户不包含管理员
      */
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @GetMapping("/simpleList")
     @ApiOperation("查询所有用户作为下拉框")
     public HttpResult<Object> simpleList() {
         String methodDescribe = getMethodDescribe("simpleList");
-        List<User> result = userService.simpleList();
+        List<User> result = userService.simpleList(false);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    /**
+     * 查询所有用户包含管理员
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getAllUserSimpleList")
+    @ApiOperation("查询所有用户作为下拉框")
+    public HttpResult<Object> getAllUserSimpleList() {
+        String methodDescribe = getMethodDescribe("getAllUserSimpleList");
+        List<User> result = userService.simpleList(true);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 }

pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java

@@ -197,7 +197,7 @@ public interface IUserService extends IService<User> {
 
     List<String> getUserIdByRoleId(List<String> roleId);
 
-    List<User> simpleList();
+    List<User> simpleList(Boolean allUserFlag);
 
 
     List<String> getColleaguesIdByUserId(String id);

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java

@@ -567,9 +567,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
     }
 
     @Override
-    public List<User> simpleList() {
+    public List<User> simpleList(Boolean allUserFlag) {
         LambdaQueryWrapper<User> userLambdaQueryWrapper = new LambdaQueryWrapper<>();
-        userLambdaQueryWrapper.select(User::getId, User::getName).eq(User::getState, DataStateEnum.ENABLE.getCode()).eq(User::getType,2);
+        userLambdaQueryWrapper.select(User::getId, User::getName).eq(User::getState, DataStateEnum.ENABLE.getCode());
+        if(!allUserFlag){
+            userLambdaQueryWrapper.eq(User::getType,2);
+        }
         return this.baseMapper.selectList(userLambdaQueryWrapper);
     }