|
|
@@ -76,13 +76,14 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
|
|
|
|
|
|
@Override
|
|
|
public List<SysMenu> getRoleMenuTree(String systemCode, String userId) {
|
|
|
+ log.info("查询租户下的用户拥有的菜单权限。systemCode=[{}], userId=[{}] ", systemCode, userId);
|
|
|
List<SysUserRole> sysUserRole = sysUserRoleMapper.selectByUserIdAndSysCodeOne(userId,systemCode);
|
|
|
// modify by lipf ,2026年4月3日08:52:05, 解决NPE 异常
|
|
|
if(sysUserRole == null || sysUserRole.isEmpty()){
|
|
|
log.info("租户[{}]下的用户[{}]角色为空",systemCode, userId);
|
|
|
return Collections.emptyList();
|
|
|
}
|
|
|
- List<SysMenu> menus = this.getMenuByRoleId(sysUserRole.stream().map(x->x.getRoleId()).toList());
|
|
|
+ List<SysMenu> menus = this.getMenuByRoleId(sysUserRole.stream().map(SysUserRole::getRoleId).toList());
|
|
|
List<SysMenu> sysMenus = new ArrayList<>();
|
|
|
for (SysMenu menu : menus) {
|
|
|
if (menu.getParentId() == null || menu.getParentId().equalsIgnoreCase("0")) {
|
|
|
@@ -195,6 +196,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu>
|
|
|
.values()
|
|
|
.stream()
|
|
|
.toList();
|
|
|
+ log.info("根据角色序号查询有权限的菜单: roleIds=[{}]distinctMenuList=[{}]", JSONUtil.toJsonStr(roleIds), JSONUtil.toJsonStr(distinctMenuList));
|
|
|
return distinctMenuList;
|
|
|
}
|
|
|
|