diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java index 6e2a844c..0f7ef555 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/BizOrgService.java @@ -91,7 +91,7 @@ public interface BizOrgService extends IService { * @author xuyuxiang * @date 2022/7/25 19:42 **/ - List getCachedAllOrgList(); + List getAllOrgList(); /** * 根据机构全名称获取机构id,有则返回,无则创建 diff --git a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java index 7459fe82..fc9c0240 100644 --- a/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java +++ b/snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/org/service/impl/BizOrgServiceImpl.java @@ -257,23 +257,13 @@ public class BizOrgServiceImpl extends ServiceImpl impleme } @Override - public List getCachedAllOrgList() { - // 从缓存中取 - Object cacheValue = commonCacheOperator.get(ORG_CACHE_ALL_KEY); - if(ObjectUtil.isNotEmpty(cacheValue)) { - return JSONUtil.toList(JSONUtil.parseArray(cacheValue), BizOrg.class); - } - List orgList = this.list(new LambdaQueryWrapper().orderByAsc(BizOrg::getSortCode)); - if(ObjectUtil.isNotEmpty(orgList)) { - // 更新到缓存 - commonCacheOperator.put(ORG_CACHE_ALL_KEY, JSONUtil.toJsonStr(orgList)); - } - return orgList; + public List getAllOrgList() { + return this.list(new LambdaQueryWrapper().orderByAsc(BizOrg::getSortCode)); } @Override public String getOrgIdByOrgFullNameWithCreate(String orgFullName) { - List cachedAllOrgList = this.getCachedAllOrgList(); + List cachedAllOrgList = this.getAllOrgList(); List> treeList = TreeUtil.build(cachedAllOrgList.stream().map(bizOrg -> new TreeNode<>(bizOrg.getId(), bizOrg.getParentId(), bizOrg.getName(), bizOrg.getSortCode())) .collect(Collectors.toList()), "0"); diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java index c701fc35..bbbda1c8 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -1501,11 +1501,11 @@ public class SysUserServiceImpl extends ServiceImpl impl return this.getAllUserSelectorList(); } else { if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getOrgId())) { - // 如果机构id不为空,则查询该机构所在顶级机构下的所有人 - List parentAndChildOrgIdList = CollStreamUtil.toList(sysOrgService.getParentAndChildListById(sysOrgService + // 如果机构id不为空,则查询该机构极其子机构下的所有人 + List childOrgIdList = CollStreamUtil.toList(sysOrgService.getChildListById(sysOrgService .getCachedAllOrgList(), sysUserSelectorUserParam.getOrgId(), true), SysOrg::getId); - if (ObjectUtil.isNotEmpty(parentAndChildOrgIdList)) { - lambdaQueryWrapper.in(SysUser::getOrgId, parentAndChildOrgIdList); + if (ObjectUtil.isNotEmpty(childOrgIdList)) { + lambdaQueryWrapper.in(SysUser::getOrgId, childOrgIdList); } else { return new Page<>(); }