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

【8.1.3】【system】抽象用户组织机构的获取

dev-8.1.9
fengshuonan 2024-03-21 00:11:11 +08:00
parent fd03e24df8
commit 26ca42eef3
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,8 @@ public class UserIndexInfoService {
this.fillUserBaseInfo(loginUser.getUserId(), userIndexInfo);
// 2. 获取用户所有的部门和任职信息，并默认激活（选中）主部门的任职信息
this.fillUserOrgInfo(loginUser, userIndexInfo);
List<IndexUserOrgInfo> indexUserOrgInfos = this.fillUserOrgInfo(loginUser);
userIndexInfo.setUserOrgInfoList(indexUserOrgInfos);
// 3. 获取用户的权限编码集合
List<SysMenu> userMenuList = this.fillUserPermissionCodeList(loginUser, userIndexInfo);
@ -144,19 +145,6 @@ public class UserIndexInfoService {
sessionManagerApi.updateSession(loginUser.getToken(), loginUser);
}
/**
* 填充用户的基本姓名和头像信息
*
* @author fengshuonan
* @since 2023/6/18 23:01
*/
private void fillUserBaseInfo(Long userId, UserIndexInfo userIndexInfo) {
SimpleUserDTO simpleUserDTO = sysUserServiceApi.getUserInfoByUserId(userId);
userIndexInfo.setUserId(simpleUserDTO.getUserId());
userIndexInfo.setRealName(simpleUserDTO.getRealName());
userIndexInfo.setAvatarUrl(simpleUserDTO.getAvatarUrl());
}
/**
* 获取用户的任职信息，包含了机构的详细描述
* <p>
@ -167,7 +155,7 @@ public class UserIndexInfoService {
* @author fengshuonan
* @since 2023/6/18 23:33
*/
private void fillUserOrgInfo(LoginUser loginUser, UserIndexInfo userIndexInfo) {
public List<IndexUserOrgInfo> fillUserOrgInfo(LoginUser loginUser) {
List<IndexUserOrgInfo> resultUserOrg = new ArrayList<>();
@ -179,8 +167,7 @@ public class UserIndexInfoService {
// 查询到机构为空，直接返回
if (ObjectUtil.isEmpty(userOrgList)) {
userIndexInfo.setUserOrgInfoList(resultUserOrg);
return;
return resultUserOrg;
}
// 判断用户是否被改过机构，判断currentOrgId是否失效
@ -245,7 +232,20 @@ public class UserIndexInfoService {
}
// 填充用户组织机构信息
userIndexInfo.setUserOrgInfoList(resultUserOrg);
return resultUserOrg;
}
/**
* 填充用户的基本姓名和头像信息
*
* @author fengshuonan
* @since 2023/6/18 23:01
*/
private void fillUserBaseInfo(Long userId, UserIndexInfo userIndexInfo) {
SimpleUserDTO simpleUserDTO = sysUserServiceApi.getUserInfoByUserId(userId);
userIndexInfo.setUserId(simpleUserDTO.getUserId());
userIndexInfo.setRealName(simpleUserDTO.getRealName());
userIndexInfo.setAvatarUrl(simpleUserDTO.getAvatarUrl());
}
/**