【7.2.5】【org】更新用户下拉选择

kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserController.java

@@ -258,6 +258,8 @@ public class SysUserController {
 
     /**
      * 用户下拉列表，可以根据姓名搜索
+     * <p>
+     * 本接口不查询超级管理员
      *
      * @param sysUserRequest 请求参数：name 姓名(可选)
      * @return 返回除超级管理员外的用户列表
@@ -269,6 +271,21 @@ public class SysUserController {
         return new SuccessResponseData<>(sysUserService.selector(sysUserRequest));
     }
 
+    /**
+     * 用户下拉列表，可以根据姓名搜索
+     * <p>
+     * 本接口可查询到超级管理员，包含所有用户
+     *
+     * @param sysUserRequest 请求参数：name 姓名(可选)
+     * @return 返回除超级管理员外的用户列表
+     * @author luojie
+     * @date 2020/11/6 09:49
+     */
+    @GetResource(name = "系统用户_选择器", path = "/sysUser/selectorAll")
+    public ResponseData<List<SimpleDict>> selectorAll(SysUserRequest sysUserRequest) {
+        return new SuccessResponseData<>(sysUserService.selectorWithAdmin(sysUserRequest));
+    }
+
     /**
      * 获取所有用户ID和名称列表
      *

kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserService.java

@@ -221,7 +221,7 @@ public interface SysUserService extends IService<SysUser>, UserServiceApi {
     List<UserSelectTreeNode> getUserTreeNodeList(Long orgId, List<UserSelectTreeNode> treeNodeList);
 
     /**
-     * 用户下拉列表选择
+     * 查询所有用户下拉列表（不含管理员）
      *
      * @param sysUserRequest 查询参数
      * @return 用户列表集合
@@ -230,6 +230,16 @@ public interface SysUserService extends IService<SysUser>, UserServiceApi {
      */
     List<SimpleDict> selector(SysUserRequest sysUserRequest);
 
+    /**
+     * 查询所有用户下拉列表（含管理员）
+     *
+     * @param sysUserRequest 查询参数
+     * @return 用户列表集合
+     * @author fengshuonan
+     * @date 2022/9/19 20:51
+     */
+    List<SimpleDict> selectorWithAdmin(SysUserRequest sysUserRequest);
+
     /**
      * 批量删除用户
      *

kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserServiceImpl.java

@@ -593,26 +593,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 
     @Override
     public List<SimpleDict> selector(SysUserRequest sysUserRequest) {
+        return this.selectUserList(sysUserRequest, false);
+    }
 
-        LambdaQueryWrapper<SysUser> wrapper = createWrapper(sysUserRequest);
-
-        // 排除超级管理员
-        wrapper.ne(SysUser::getSuperAdminFlag, YesOrNotEnum.Y.getCode());
-
-        // 只查询id和name
-        wrapper.select(SysUser::getRealName, SysUser::getUserId, SysUser::getAccount);
-        List<SysUser> list = this.list(wrapper);
-
-        ArrayList<SimpleDict> results = new ArrayList<>();
-        for (SysUser sysUser : list) {
-            SimpleDict simpleDict = new SimpleDict();
-            simpleDict.setId(sysUser.getUserId());
-            simpleDict.setName(sysUser.getRealName());
-            simpleDict.setCode(sysUser.getAccount());
-            results.add(simpleDict);
-        }
-
-        return results;
+    @Override
+    public List<SimpleDict> selectorWithAdmin(SysUserRequest sysUserRequest) {
+        return this.selectUserList(sysUserRequest, true);
     }
 
     @Override
@@ -1041,4 +1027,37 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         return queryWrapper;
     }
 
+    /**
+     * 查询用户下拉列表
+     *
+     * @param sysUserRequest 请求查询条件
+     * @param withAdminFlag  是否携带admin用户，true-携带
+     * @author fengshuonan
+     * @date 2022/9/19 20:55
+     */
+    private List<SimpleDict> selectUserList(SysUserRequest sysUserRequest, boolean withAdminFlag) {
+
+        LambdaQueryWrapper<SysUser> wrapper = createWrapper(sysUserRequest);
+
+        // 排除超级管理员
+        if (!withAdminFlag) {
+            wrapper.ne(SysUser::getSuperAdminFlag, YesOrNotEnum.Y.getCode());
+        }
+
+        // 只查询id和name
+        wrapper.select(SysUser::getRealName, SysUser::getUserId, SysUser::getAccount);
+        List<SysUser> list = this.list(wrapper);
+
+        ArrayList<SimpleDict> results = new ArrayList<>();
+        for (SysUser sysUser : list) {
+            SimpleDict simpleDict = new SimpleDict();
+            simpleDict.setId(sysUser.getUserId());
+            simpleDict.setName(sysUser.getRealName());
+            simpleDict.setCode(sysUser.getAccount());
+            results.add(simpleDict);
+        }
+
+        return results;
+    }
+
 }