gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【8.1.0】【org】获取机构列表，更新筛选条件

pull/60/head
fengshuonan 2024-01-16 19:38:58 +08:00
parent 944fec4ed0
commit 7d95e327c0
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/sys/api/SysUserOrgServiceApi.java
View File

@ -26,10 +26,12 @@ public interface SysUserOrgServiceApi {
/** /**
* 获取用户绑定的组织机构列表，主要任职部门和次要任职部门都返回 * 获取用户绑定的组织机构列表，主要任职部门和次要任职部门都返回
* *
* @param userId 用户id
* @param getTotalOrg 是否获取用户所属的所有组织机构，true-获取所有，false-只获取启用的部门
* @author fengshuonan * @author fengshuonan
* @since 2023/6/11 21:08 * @since 2023/6/11 21:08
*/ */
List<UserOrgDTO> getUserOrgList(Long userId); List<UserOrgDTO> getUserOrgList(Long userId, boolean getTotalOrg);
/** /**
* 获取某个机构下的所有用户id集合 * 获取某个机构下的所有用户id集合

6
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserOrgServiceImpl.java
View File

@ -159,7 +159,7 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgMapper, SysUser
} }
@Override @Override
public List<UserOrgDTO> getUserOrgList(Long userId) { public List<UserOrgDTO> getUserOrgList(Long userId, boolean getTotalOrg) {
if (userId == null) { if (userId == null) {
return null; return null;
@ -168,7 +168,9 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgMapper, SysUser
// 获取用户所有的部门信息（只查询用户启用的部门） // 获取用户所有的部门信息（只查询用户启用的部门）
LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUserOrg::getUserId, userId); 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); queryWrapper.orderByDesc(SysUserOrg::getMainFlag);
List<SysUserOrg> sysUserOrgList = this.list(queryWrapper); List<SysUserOrg> sysUserOrgList = this.list(queryWrapper);

2
kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserServiceImpl.java
View File

@ -214,7 +214,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
SysUser sysUser = this.getOne(sysUserLambdaQueryWrapper, false); SysUser sysUser = this.getOne(sysUserLambdaQueryWrapper, false);
// 获取用户的组织机构信息 // 获取用户的组织机构信息
List<UserOrgDTO> userOrgList = sysUserOrgService.getUserOrgList(sysUser.getUserId()); List<UserOrgDTO> userOrgList = sysUserOrgService.getUserOrgList(sysUser.getUserId(), true);
sysUser.setUserOrgDTOList(userOrgList); sysUser.setUserOrgDTOList(userOrgList);
// 获取用户的角色信息 // 获取用户的角色信息

5
kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/login/service/UserIndexInfoService.java
View File

@ -128,8 +128,7 @@ public class UserIndexInfoService {
loginUser.setCurrentOrgId(updateUserOrgAppRequest.getNewOrgId()); loginUser.setCurrentOrgId(updateUserOrgAppRequest.getNewOrgId());
// 设置用户在当前机构下的职位id // 设置用户在当前机构下的职位id
Long positionId = sysUserOrgServiceApi.getUserOrgPositionId(loginUser.getUserId(), Long positionId = sysUserOrgServiceApi.getUserOrgPositionId(loginUser.getUserId(), updateUserOrgAppRequest.getNewOrgId());
updateUserOrgAppRequest.getNewOrgId());
loginUser.setCurrentPositionId(positionId); loginUser.setCurrentPositionId(positionId);
} }
@ -176,7 +175,7 @@ public class UserIndexInfoService {
Long currentOrgId = loginUser.getCurrentOrgId(); Long currentOrgId = loginUser.getCurrentOrgId();
// 获取用户的所有组织机构集合 // 获取用户的所有组织机构集合
List<UserOrgDTO> userOrgList = sysUserOrgServiceApi.getUserOrgList(loginUser.getUserId()); List<UserOrgDTO> userOrgList = sysUserOrgServiceApi.getUserOrgList(loginUser.getUserId(), false);
// 查询到机构为空，直接返回 // 查询到机构为空，直接返回
if (ObjectUtil.isEmpty(userOrgList)) { if (ObjectUtil.isEmpty(userOrgList)) {