From 352bf642babb3cb2bc3b39291fa612eff22ea1ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com> Date: Wed, 28 Jun 2023 00:34:57 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E5=8D=87=E7=BA=A7=E5=A6=82=E4=B8=8B=EF=BC=9A=201?= =?UTF-8?q?=E3=80=81=E4=BA=BA=E5=91=98=E3=80=81=E6=9C=BA=E6=9E=84=E3=80=81?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E3=80=81=E5=B2=97=E4=BD=8D=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E5=99=A8list=E6=8E=A5=E5=8F=A3=E5=85=A8=E9=83=A8=E5=8D=87?= =?UTF-8?q?=E7=BA=A7=E4=B8=BApage=E5=88=86=E9=A1=B5=E6=8E=A5=E5=8F=A3=202?= =?UTF-8?q?=E3=80=81userCenter=E6=8E=A7=E5=88=B6=E5=99=A8=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=BA=E5=91=98=E3=80=81=E6=9C=BA=E6=9E=84=E3=80=81?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E3=80=81=E5=B2=97=E4=BD=8D=E5=B7=B2=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E7=9A=84=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=95=B0=E7=BB=84?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AF=B9=E8=B1=A1=E6=95=B0=E7=BB=84=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java | 2 +- .../sys/modular/role/service/impl/SysRoleServiceImpl.java | 2 +- .../sys/modular/user/service/impl/SysUserServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java index 0aee24f7..dd21d7bc 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/org/service/impl/SysOrgServiceImpl.java @@ -311,7 +311,7 @@ public class SysOrgServiceImpl extends ServiceImpl impleme SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate); // 如果查询条件为空，则直接查询 if(ObjectUtil.isAllEmpty(sysOrgSelectorUserParam.getOrgId(), sysOrgSelectorUserParam.getSearchKey())) { - return sysUserService.getCachedAllUserSelectorList(); + return sysUserService.getAllUserSelectorList(); } else { if(ObjectUtil.isNotEmpty(sysOrgSelectorUserParam.getOrgId())) { // 如果组织id不为空，则查询该组织所在顶级组织下的所有人 diff --git a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java index a7d99759..ca8ca93c 100644 --- a/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java +++ b/snowy-plugin/snowy-plugin-sys/src/main/java/vip/xiaonuo/sys/modular/role/service/impl/SysRoleServiceImpl.java @@ -457,7 +457,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate); // 如果查询条件为空，则直接查询 if(ObjectUtil.isAllEmpty(sysRoleSelectorUserParam.getOrgId(), sysRoleSelectorUserParam.getSearchKey())) { - return sysUserService.getCachedAllUserSelectorList(); + return sysUserService.getAllUserSelectorList(); } else { if (ObjectUtil.isNotEmpty(sysRoleSelectorUserParam.getOrgId())) { // 如果机构id不为空，则查询该机构所在顶级机构下的所有人 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 04e0cfcf..c701fc35 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 @@ -1498,7 +1498,7 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUser::getName, SysUser::getSortCode, SysUser::getGender, SysUser::getEntryDate); // 如果查询条件为空，则直接查询 if(ObjectUtil.isAllEmpty(sysUserSelectorUserParam.getOrgId(), sysUserSelectorUserParam.getSearchKey())) { - return this.getCachedAllUserSelectorList(); + return this.getAllUserSelectorList(); } else { if (ObjectUtil.isNotEmpty(sysUserSelectorUserParam.getOrgId())) { // 如果机构id不为空，则查询该机构所在顶级机构下的所有人