装货配置的装货员选择接口调整

snowy-admin-web/src/api/biz/bizUserApi.js

@@ -58,6 +58,10 @@ export default {
 	userOrgTreeSelector(data) {
 		return request('orgTreeSelector', data, 'get')
 	},
+	// 根据角色名称获取用户选择器
+	userSelectorByRole(data) {
+		return request('userSelectorByRole', data, 'get')
+	},
 	// 获取职位选择器
 	userPositionSelector(data) {
 		return request('positionSelector', data, 'get')

snowy-admin-web/src/api/sys/userApi.js

@@ -62,10 +62,6 @@ export default {
 	userSelector(data) {
 		return request('userSelector', data, 'get')
 	},
-	// 根据角色名称获取用户选择器
-	userSelectorByRole(data) {
-		return request('userSelectorByRole', data, 'get')
-	},
 	// 用户拥有角色
 	userOwnRole(data) {
 		return request('ownRole', data, 'get')

snowy-admin-web/src/views/biz/bizloadpoint/userForm.vue

@@ -28,7 +28,7 @@
 	import { cloneDeep } from 'lodash-es'
 	import { required } from '@/utils/formRules'
 	import bizLoadUserApi from '@/api/biz/bizLoadUserApi'
-	import userApi from '@/api/sys/userApi'
+	import userApi from '@/api/biz/bizUserApi'
 
 	// 抽屉状态
 	const open = ref(false)

snowy-plugin-api/snowy-plugin-sys-api/src/main/java/vip/xiaonuo/sys/api/SysRoleApi.java

@@ -48,4 +48,6 @@ public interface SysRoleApi {
      * @date 2022/11/1 15:58
      **/
     void grantForGenMenuAndButton(String menuId);
+
+    List<String> getRoleIdList(String roleName);
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/controller/BizUserController.java

@@ -391,4 +391,16 @@ public class BizUserController {
         bizUserService.addCustomerAccount(bizUserAddParam);
         return CommonResult.ok();
     }
+
+    /**
+     * 根据角色获取用户选择器
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:00
+     */
+    @Operation(summary = "根据角色获取用户选择器")
+    @GetMapping("/biz/user/userSelectorByRole")
+    public CommonResult<Page<BizUser>> userSelectorByRole(BizUserPageParam bizUserPageParam) {
+        return CommonResult.data(bizUserService.userSelectorByRole(bizUserPageParam));
+    }
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserPageParam.java

@@ -57,4 +57,8 @@ public class BizUserPageParam {
     /**客户id*/
     @Schema(description = "客户id")
     private String customerId;
+
+    /** 角色名称 */
+    @Schema(description = "角色名称")
+    private String roleName;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/BizUserService.java

@@ -41,6 +41,13 @@ public interface BizUserService extends IService<BizUser> {
      */
     Page<BizUser> page(BizUserPageParam bizUserPageParam);
 
+    /**
+     * userSelectorByRole
+     *
+     * @author xuyuxiang
+     * @date 2022/4/24 20:08
+     */
+    Page<BizUser> userSelectorByRole(BizUserPageParam bizUserPageParam);
 
 
     /**

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/service/impl/BizUserServiceImpl.java

@@ -13,7 +13,6 @@
 package vip.xiaonuo.biz.modular.user.service.impl;
 
 import cn.afterturn.easypoi.cache.manager.POICacheManager;
-import cn.afterturn.easypoi.entity.ImageEntity;
 import cn.afterturn.easypoi.word.WordExportUtil;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
@@ -22,7 +21,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.img.ImgUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNode;
@@ -69,7 +67,6 @@ import vip.xiaonuo.biz.modular.user.param.*;
 import vip.xiaonuo.biz.modular.user.result.BizUserExportResult;
 import vip.xiaonuo.biz.modular.user.result.BizUserRoleResult;
 import vip.xiaonuo.biz.modular.user.service.BizUserService;
-import vip.xiaonuo.common.enums.CommonSortOrderEnum;
 import vip.xiaonuo.common.excel.CommonExcelCustomMergeStrategy;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.common.listener.CommonDataChangeEventCenter;
@@ -158,6 +155,60 @@ public class BizUserServiceImpl extends ServiceImpl<BizUserMapper, BizUser> impl
         return this.baseMapper.page(CommonPageRequest.defaultPage(), queryWrapper);
     }
 
+    @Override
+    public Page<BizUser> userSelectorByRole(BizUserPageParam bizUserPageParam) {
+        // 获取角色ID
+        List<String> sysRoleIdList = sysRoleApi.getRoleIdList(bizUserPageParam.getRoleName());
+
+        LambdaQueryWrapper<BizUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        // 只查询部分字段
+        lambdaQueryWrapper.select(BizUser::getId, BizUser::getOrgId, BizUser::getPositionId, BizUser::getAccount,
+                BizUser::getName, BizUser::getSortCode, BizUser::getGender, BizUser::getEntryDate);
+        // 判断角色
+        if(null != sysRoleIdList && 0 < sysRoleIdList.size()){
+            QueryWrapper<BizUser> queryWrapper = new QueryWrapper<BizUser>().checkSqlInjection();
+            if (ObjectUtil.isNotEmpty(bizUserPageParam.getSearchKey())) {
+                queryWrapper.like("a.name", bizUserPageParam.getSearchKey());
+            }
+            if (ObjectUtil.isNotEmpty(bizUserPageParam.getOrgId())) {
+                // 如果组织id不为空，则查询该组织及其子组织下的所有人
+                List<String> childOrgIdList = CollStreamUtil.toList(bizOrgService.getChildListById(bizOrgService
+                        .getAllOrgList(), bizUserPageParam.getOrgId(), true), BizOrg::getId);
+                if (ObjectUtil.isNotEmpty(childOrgIdList)) {
+                    queryWrapper.in("a.org_id", childOrgIdList);
+                }
+            }
+            if (ObjectUtil.isNotEmpty(sysRoleIdList)) {
+                queryWrapper.in("sro.ID", sysRoleIdList);
+            }
+            queryWrapper.eq("a.DELETE_FLAG", "NOT_DELETE");
+            return this.baseMapper.page(CommonPageRequest.defaultPage(), queryWrapper);
+        }else{
+            // 角色不存在，默认查询全部人员
+            if(ObjectUtil.isAllEmpty(bizUserPageParam.getOrgId(), bizUserPageParam.getSearchKey())) {
+                return this.page(CommonPageRequest.defaultPage(), new LambdaQueryWrapper<BizUser>().select(BizUser::getId,
+                        BizUser::getOrgId, BizUser::getPositionId, BizUser::getAccount, BizUser::getName,
+                        BizUser::getSortCode, BizUser::getGender, BizUser::getEntryDate).orderByAsc(BizUser::getSortCode));
+            } else {
+                if (ObjectUtil.isNotEmpty(bizUserPageParam.getOrgId())) {
+                    // 如果组织id不为空，则查询该组织及其子组织下的所有人
+                    List<String> childOrgIdList = CollStreamUtil.toList(bizOrgService.getChildListById(bizOrgService
+                            .getAllOrgList(), bizUserPageParam.getOrgId(), true), BizOrg::getId);
+                    if (ObjectUtil.isNotEmpty(childOrgIdList)) {
+                        lambdaQueryWrapper.in(BizUser::getOrgId, childOrgIdList);
+                    } else {
+                        return new Page<>();
+                    }
+                }
+                if (ObjectUtil.isNotEmpty(bizUserPageParam.getSearchKey())) {
+                    lambdaQueryWrapper.like(BizUser::getName, bizUserPageParam.getSearchKey());
+                }
+                lambdaQueryWrapper.orderByAsc(BizUser::getSortCode);
+                return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
+            }
+        }
+    }
+
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void add(BizUserAddParam bizUserAddParam) {

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/provider/SysRoleApiProvider.java

@@ -13,6 +13,7 @@
 package vip.xiaonuo.sys.modular.role.provider;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONObject;
@@ -107,4 +108,15 @@ public class SysRoleApiProvider implements SysRoleApi {
         }
         sysRelationService.saveRelationBatchWithAppend(superAdminRoleId, menuIdList, SysRelationCategoryEnum.SYS_ROLE_HAS_RESOURCE.getValue(), extJsonList);
     }
+
+    @Override
+    public List<String> getRoleIdList(String roleName) {
+        // 查询角色
+        LambdaQueryWrapper<SysRole> roleQW = new LambdaQueryWrapper<>();
+        roleQW.select(SysRole::getId);
+        roleQW.eq(SysRole::getName, roleName);
+        List<String> sysRoleIdList = CollStreamUtil.toList(sysRoleService.list(roleQW), SysRole::getId);
+
+        return sysRoleIdList;
+    }
 }

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/controller/SysUserController.java

@@ -353,16 +353,4 @@ public class SysUserController {
     public CommonResult<Page<SysUser>> userSelector(SysUserSelectorUserParam sysUserSelectorUserParam) {
         return CommonResult.data(sysUserService.userSelector(sysUserSelectorUserParam));
     }
-
-    /**
-     * 根据角色获取用户选择器
-     *
-     * @author xuyuxiang
-     * @date 2022/4/24 20:00
-     */
-    @Operation(summary = "根据角色获取用户选择器")
-    @GetMapping("/sys/user/userSelectorByRole")
-    public CommonResult<Page<SysUser>> userSelectorByRole(SysUserSelectorUserParam sysUserSelectorUserParam) {
-        return CommonResult.data(sysUserService.userSelectorByRole(sysUserSelectorUserParam));
-    }
 }

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/provider/SysUserApiProvider.java

@@ -14,6 +14,7 @@ package vip.xiaonuo.sys.modular.user.provider;
 
 import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
@@ -25,6 +26,8 @@ import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
 import vip.xiaonuo.common.exception.CommonException;
 import vip.xiaonuo.sys.api.SysUserApi;
+import vip.xiaonuo.sys.modular.role.entity.SysRole;
+import vip.xiaonuo.sys.modular.role.service.SysRoleService;
 import vip.xiaonuo.sys.modular.user.entity.SysUser;
 import vip.xiaonuo.sys.modular.user.param.SysUserGrantRoleParam;
 import vip.xiaonuo.sys.modular.user.param.SysUserIdParam;

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/SysUserService.java

@@ -439,14 +439,6 @@ public interface SysUserService extends IService<SysUser> {
      */
     Page<SysUser> userSelector(SysUserSelectorUserParam sysUserSelectorUserParam);
 
-    /**
-     * userSelectorByRole
-     *
-     * @author xuyuxiang
-     * @date 2022/4/24 20:08
-     */
-    Page<SysUser> userSelectorByRole(SysUserSelectorUserParam sysUserSelectorUserParam);
-
     /**
      * 获取登录用户的站内信分页
      *

snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java

@@ -1540,61 +1540,6 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         }
     }
 
-        @Override
-    public Page<SysUser> userSelectorByRole(SysUserSelectorUserParam sysUserSelectorUserParam) {
-        // 查询角色
-        LambdaQueryWrapper<SysRole> roleQW = new LambdaQueryWrapper<>();
-        roleQW.select(SysRole::getId);
-        roleQW.eq(SysRole::getName, sysUserSelectorUserParam.getRoleName());
-        List<String> sysRoleIdList = CollStreamUtil.toList(sysRoleService.list(roleQW), SysRole::getId);
-
-        LambdaQueryWrapper<SysUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        // 只查询部分字段
-        lambdaQueryWrapper.select(SysUser::getId, SysUser::getOrgId, SysUser::getPositionId, SysUser::getAccount,
-                                    SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate);
-        // 判断角色
-        if(null != sysRoleIdList && 0 < sysRoleIdList.size()){
-            QueryWrapper<SysUser> queryWrapper = new QueryWrapper<SysUser>().checkSqlInjection();
-            if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getSearchKey())) {
-                queryWrapper.like("a.name", sysUserSelectorUserParam.getSearchKey());
-            }
-            if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getOrgId())) {
-                // 如果组织id不为空，则查询该组织及其子组织下的所有人
-                List<String> childOrgIdList = CollStreamUtil.toList(sysOrgService.getChildListById(sysOrgService
-                        .getAllOrgList(), sysUserSelectorUserParam.getOrgId(), true), SysOrg::getId);
-                if (ObjectUtil.isNotEmpty(childOrgIdList)) {
-                    queryWrapper.in("a.org_id", childOrgIdList);
-                }
-            }
-            if (ObjectUtil.isNotEmpty(sysRoleIdList)) {
-                queryWrapper.in("sro.ID", sysRoleIdList);
-            }
-            queryWrapper.eq("a.DELETE_FLAG", "NOT_DELETE");
-            return this.baseMapper.page(CommonPageRequest.defaultPage(), queryWrapper);
-        }else{
-            // 角色不存在，默认查询全部人员
-            if(ObjectUtil.isAllEmpty(sysUserSelectorUserParam.getOrgId(), sysUserSelectorUserParam.getSearchKey())) {
-                return this.getAllUserSelectorList();
-            } else {
-                if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getOrgId())) {
-                    // 如果组织id不为空，则查询该组织及其子组织下的所有人
-                    List<String> childOrgIdList = CollStreamUtil.toList(sysOrgService.getChildListById(sysOrgService
-                            .getAllOrgList(), sysUserSelectorUserParam.getOrgId(), true), SysOrg::getId);
-                    if (ObjectUtil.isNotEmpty(childOrgIdList)) {
-                        lambdaQueryWrapper.in(SysUser::getOrgId, childOrgIdList);
-                    } else {
-                        return new Page<>();
-                    }
-                }
-                if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getSearchKey())) {
-                    lambdaQueryWrapper.like(SysUser::getName, sysUserSelectorUserParam.getSearchKey());
-                }
-                lambdaQueryWrapper.orderByAsc(SysUser::getSortCode);
-                return this.page(CommonPageRequest.defaultPage(), lambdaQueryWrapper);
-            }
-        }
-    }
-
     @Override
     public Page<SysUserMessageResult> loginMessagePage(SysUserMessagePageParam sysUserMessagePageParam) {
         Page<SysUserMessageResult> resultPage = new Page<>();

snowy-web-app/src/main/resources/application-local.properties

@@ -102,7 +102,7 @@ spring.jackson.serialization.write-dates-as-timestamps=false
 spring.data.redis.database=9
 spring.data.redis.host=127.0.0.1
 spring.data.redis.port=6379
-spring.data.redis.password=
+spring.data.redis.password=lease
 spring.data.redis.timeout=10s
 
 spring.data.redis.lettuce.pool.max-active=200