From 7d95e327c014b93d2b0c11d72088a6890a2ec96a Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 16 Jan 2024 19:38:58 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.0=E3=80=91=E3=80=90org=E3=80=91?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=BA=E6=9E=84=E5=88=97=E8=A1=A8=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AD=9B=E9=80=89=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/sys/api/SysUserOrgServiceApi.java | 4 +++- .../modular/user/service/impl/SysUserOrgServiceImpl.java | 6 ++++-- .../sys/modular/user/service/impl/SysUserServiceImpl.java | 2 +- .../sys/modular/login/service/UserIndexInfoService.java | 5 ++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserOrgServiceApi.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserOrgServiceApi.java index 9d30b5c66..2d7674d87 100644 --- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserOrgServiceApi.java +++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserOrgServiceApi.java @@ -26,10 +26,12 @@ public interface SysUserOrgServiceApi { /** * 获取用户绑定的组织机构列表，主要任职部门和次要任职部门都返回 * + * @param userId 用户id + * @param getTotalOrg 是否获取用户所属的所有组织机构，true-获取所有，false-只获取启用的部门 * @author fengshuonan * @since 2023/6/11 21:08 */ - List getUserOrgList(Long userId); + List getUserOrgList(Long userId, boolean getTotalOrg); /** * 获取某个机构下的所有用户id集合 diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java index b60336222..e9212bfe2 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java @@ -159,7 +159,7 @@ public class SysUserOrgServiceImpl extends ServiceImpl getUserOrgList(Long userId) { + public List getUserOrgList(Long userId, boolean getTotalOrg) { if (userId == null) { return null; @@ -168,7 +168,9 @@ public class SysUserOrgServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(SysUserOrg::getUserId, userId); - queryWrapper.eq(SysUserOrg::getStatusFlag, StatusEnum.ENABLE.getCode()); + if (!getTotalOrg) { + queryWrapper.eq(SysUserOrg::getStatusFlag, StatusEnum.ENABLE.getCode()); + } queryWrapper.orderByDesc(SysUserOrg::getMainFlag); List sysUserOrgList = this.list(queryWrapper); diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java index 14f6ff8a5..02697ee12 100644 --- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java +++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java @@ -214,7 +214,7 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUser sysUser = this.getOne(sysUserLambdaQueryWrapper, false); // 获取用户的组织机构信息 - List userOrgList = sysUserOrgService.getUserOrgList(sysUser.getUserId()); + List userOrgList = sysUserOrgService.getUserOrgList(sysUser.getUserId(), true); sysUser.setUserOrgDTOList(userOrgList); // 获取用户的角色信息 diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java index bab5f137d..c78e4a08a 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java @@ -128,8 +128,7 @@ public class UserIndexInfoService { loginUser.setCurrentOrgId(updateUserOrgAppRequest.getNewOrgId()); // 设置用户在当前机构下的职位id - Long positionId = sysUserOrgServiceApi.getUserOrgPositionId(loginUser.getUserId(), - updateUserOrgAppRequest.getNewOrgId()); + Long positionId = sysUserOrgServiceApi.getUserOrgPositionId(loginUser.getUserId(), updateUserOrgAppRequest.getNewOrgId()); loginUser.setCurrentPositionId(positionId); } @@ -176,7 +175,7 @@ public class UserIndexInfoService { Long currentOrgId = loginUser.getCurrentOrgId(); // 获取用户的所有组织机构集合 - List userOrgList = sysUserOrgServiceApi.getUserOrgList(loginUser.getUserId()); + List userOrgList = sysUserOrgServiceApi.getUserOrgList(loginUser.getUserId(), false); // 查询到机构为空，直接返回 if (ObjectUtil.isEmpty(userOrgList)) {