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

【7.6.0】【sys】【首页用户详情接口】调整用户菜单的返回

pull/57/head
fengshuonan 2023-06-19 23:51:42 +08:00
parent 515bd34129
commit 83865c975a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,8 +86,7 @@ public class UserIndexInfoService {
this.fillUserOrgInfo(loginUser, userIndexInfo); this.fillUserOrgInfo(loginUser, userIndexInfo);
// 3. 获取用户的权限编码集合 // 3. 获取用户的权限编码集合
ArrayList<SysMenu> userMenuList = new ArrayList<>(); List<SysMenu> userMenuList = this.fillUserPermissionCodeList(loginUser, userIndexInfo);
this.fillUserPermissionCodeList(loginUser, userIndexInfo, userMenuList);
// 4. 获取用户的当前登录App // 4. 获取用户的当前登录App
this.fillUserAppList(loginUser, userIndexInfo, userMenuList); this.fillUserAppList(loginUser, userIndexInfo, userMenuList);
@ -197,7 +196,7 @@ public class UserIndexInfoService {
* @author fengshuonan * @author fengshuonan
* @since 2023/6/19 12:38 * @since 2023/6/19 12:38
*/ */
private void fillUserPermissionCodeList(LoginUser loginUser, UserIndexInfo userIndexInfo, List<SysMenu> userMenuList) { private List<SysMenu> fillUserPermissionCodeList(LoginUser loginUser, UserIndexInfo userIndexInfo) {
Long userId = loginUser.getUserId(); Long userId = loginUser.getUserId();
@ -206,7 +205,7 @@ public class UserIndexInfoService {
if (ObjectUtil.isEmpty(roleIdList)) { if (ObjectUtil.isEmpty(roleIdList)) {
userIndexInfo.setPermissionCodeList(new HashSet<>()); userIndexInfo.setPermissionCodeList(new HashSet<>());
return; return new ArrayList<>();
} }
// 获取角色对应的菜单id和菜单功能id // 获取角色对应的菜单id和菜单功能id
@ -216,7 +215,7 @@ public class UserIndexInfoService {
HashSet<String> permissionCodeList = new HashSet<>(); HashSet<String> permissionCodeList = new HashSet<>();
// 获取菜单对应的菜单编码集合 // 获取菜单对应的菜单编码集合
userMenuList = sysMenuService.getIndexMenuInfoList(menuIdList); List<SysMenu> userMenuList = sysMenuService.getIndexMenuInfoList(menuIdList);
Set<String> menuCodeList = userMenuList.stream().map(SysMenu::getMenuCode).collect(Collectors.toSet()); Set<String> menuCodeList = userMenuList.stream().map(SysMenu::getMenuCode).collect(Collectors.toSet());
permissionCodeList.addAll(menuCodeList); permissionCodeList.addAll(menuCodeList);
@ -225,6 +224,8 @@ public class UserIndexInfoService {
permissionCodeList.addAll(optionsCodeList); permissionCodeList.addAll(optionsCodeList);
userIndexInfo.setPermissionCodeList(permissionCodeList); userIndexInfo.setPermissionCodeList(permissionCodeList);
return userMenuList;
} }
/** /**