|
@@ -90,7 +90,7 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<MenuVO> routes(String roleId, Long topMenuId,String clientId) {
|
|
|
+ public List<MenuVO> routes(String roleId, Long topMenuId,String clientId,Integer systemType) {
|
|
|
if (StringUtil.isBlank(roleId)) {
|
|
|
return null;
|
|
|
}
|
|
@@ -102,12 +102,12 @@ public class MenuServiceImpl extends ServiceImpl<MenuMapper, Menu> implements IM
|
|
|
}
|
|
|
// 非超级管理员并且不是顶部菜单请求则返回对应角色权限菜单
|
|
|
else if (!AuthUtil.isAdministrator() && Func.isEmpty(topMenuId)) {
|
|
|
- roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId),clientId));
|
|
|
+ roleMenus = tenantPackageMenu(baseMapper.roleMenuByRoleId(Func.toLongList(roleId),clientId,systemType));
|
|
|
}
|
|
|
// 顶部菜单请求返回对应角色权限菜单
|
|
|
else {
|
|
|
// 角色配置对应菜单
|
|
|
- List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId),clientId);
|
|
|
+ List<Menu> roleIdMenus = baseMapper.roleMenuByRoleId(Func.toLongList(roleId),clientId,systemType);
|
|
|
// 反向递归角色菜单所有父级
|
|
|
List<Menu> routes = new LinkedList<>(roleIdMenus);
|
|
|
roleIdMenus.forEach(roleMenu -> recursion(allMenus, routes, roleMenu));
|