From c994ada5e7060dc4b52748eb0e34910cf7315780 Mon Sep 17 00:00:00 2001
From: hongawen <83944980@qq.com>
Date: Thu, 20 Jun 2024 13:32:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/user/controller/UserController.java | 16 ++++++++++++++--
 .../java/com/njcn/user/service/IUserService.java |  2 +-
 .../njcn/user/service/impl/UserServiceImpl.java  |  7 +++++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java b/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
index acc45b2c5..80d2463f9 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/controller/UserController.java
+++ b/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);
     }
 }
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java
index 9394f5523..9f192de24 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/IUserService.java
+++ b/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);
diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java b/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
index 8c5bd7576..7efbcb029 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/UserServiceImpl.java
+++ b/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);
     }