From bc813b0ede489739f54fd4cc1bd8fce2daec377c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=90=E7=8E=89=E7=A5=A5?= <xuyuxiang29@foxmail.com>
Date: Thu, 29 Jun 2023 23:33:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=A2=9E=E5=BC=BA=E3=80=91=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E3=80=81=E6=9C=BA=E6=9E=84=E9=80=89=E6=8B=A9=E5=99=A8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/modular/org/service/BizOrgService.java   |  2 +-
 .../org/service/impl/BizOrgServiceImpl.java      | 16 +++-------------
 .../user/service/impl/SysUserServiceImpl.java    |  8 ++++----
 3 files changed, 8 insertions(+), 18 deletions(-)

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<BizOrg> {
      * @author xuyuxiang
      * @date 2022/7/25 19:42
      **/
-    List<BizOrg> getCachedAllOrgList();
+    List<BizOrg> 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<BizOrgMapper, BizOrg> impleme
     }
 
     @Override
-    public List<BizOrg> getCachedAllOrgList() {
-        // 从缓存中取
-        Object cacheValue = commonCacheOperator.get(ORG_CACHE_ALL_KEY);
-        if(ObjectUtil.isNotEmpty(cacheValue)) {
-            return JSONUtil.toList(JSONUtil.parseArray(cacheValue), BizOrg.class);
-        }
-        List<BizOrg> orgList = this.list(new LambdaQueryWrapper<BizOrg>().orderByAsc(BizOrg::getSortCode));
-        if(ObjectUtil.isNotEmpty(orgList)) {
-            // 更新到缓存
-            commonCacheOperator.put(ORG_CACHE_ALL_KEY, JSONUtil.toJsonStr(orgList));
-        }
-        return orgList;
+    public List<BizOrg> getAllOrgList() {
+        return this.list(new LambdaQueryWrapper<BizOrg>().orderByAsc(BizOrg::getSortCode));
     }
 
     @Override
     public String getOrgIdByOrgFullNameWithCreate(String orgFullName) {
-        List<BizOrg> cachedAllOrgList = this.getCachedAllOrgList();
+        List<BizOrg> cachedAllOrgList = this.getAllOrgList();
         List<Tree<String>> 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<SysUserMapper, SysUser> impl
             return this.getAllUserSelectorList();
         } else {
             if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getOrgId())) {
-                        // 如果机构id不为空，则查询该机构所在顶级机构下的所有人
-                        List<String> parentAndChildOrgIdList = CollStreamUtil.toList(sysOrgService.getParentAndChildListById(sysOrgService
+                // 如果机构id不为空，则查询该机构极其子机构下的所有人
+                List<String> 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<>();
                 }