|
@@ -90,9 +90,9 @@ public class SaasRoleMenuHandler {
|
|
|
List<SaasMenu> menuTree = null;
|
|
|
if (SaasCommonConstant.STR_STATUS_0.equals(accountType) && SaasCommonConstant.STR_STATUS_0.equals(accountBelong)) {
|
|
|
// 如果是运维系统的账号,accountType为0的情况下查询所有菜单权限,其余情况走表关联查询,为1时,后续可添加
|
|
|
- menuTree = this.querySaasMenuTree(null, null, queryVO.getProjectId(), queryVO.getAppId(), true, queryVO.isMenu());
|
|
|
+ menuTree = this.querySaasMenuTree(null, accountBelong, null, queryVO.getProjectId(), queryVO.getAppId(), true, queryVO.isMenu());
|
|
|
} else {
|
|
|
- menuTree = this.querySaasMenuTree(queryVO.getAccountId(), queryVO.getGroupCode(), queryVO.getProjectId(), queryVO.getAppId(), false, queryVO.isMenu());
|
|
|
+ menuTree = this.querySaasMenuTree(queryVO.getAccountId(), accountBelong, queryVO.getGroupCode(), queryVO.getProjectId(), queryVO.getAppId(), false, queryVO.isMenu());
|
|
|
}
|
|
|
return menuTree;
|
|
|
}
|
|
@@ -101,6 +101,7 @@ public class SaasRoleMenuHandler {
|
|
|
* 查询账号菜单功能权限树,菜单定义和角色定义编码相同,所以这里应该同步传递
|
|
|
*
|
|
|
* @param accountId
|
|
|
+ * @param accountBelong
|
|
|
* @param groupCode
|
|
|
* @param projectId
|
|
|
* @param appId
|
|
@@ -108,7 +109,7 @@ public class SaasRoleMenuHandler {
|
|
|
* @param isMenu 是否仅查询出菜单树,true-是
|
|
|
* @return 空集合或数据菜单树
|
|
|
*/
|
|
|
- public List<SaasMenu> querySaasMenuTree(String accountId, String groupCode, String projectId, String appId, boolean isAdmin, boolean isMenu) {
|
|
|
+ public List<SaasMenu> querySaasMenuTree(String accountId, String accountBelong, String groupCode, String projectId, String appId, boolean isAdmin, boolean isMenu) {
|
|
|
// 1.获取此账号对应菜单集合
|
|
|
List<SaasMenu> menuTree = null;
|
|
|
if (isAdmin) {
|
|
@@ -130,13 +131,14 @@ public class SaasRoleMenuHandler {
|
|
|
}
|
|
|
}
|
|
|
List<SaasMenu> parents = topMenus.stream().sorted(Comparator.comparing(SaasMenu::getMenuSort)).collect(Collectors.toList());
|
|
|
- this.setMenuChildrens(accountId, groupCode, projectId, menuTree, parents, isAdmin, !isMenu);
|
|
|
+ this.setMenuChildrens(accountId, accountBelong, groupCode, projectId, menuTree, parents, isAdmin, !isMenu);
|
|
|
return parents;
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
* 生成菜单树
|
|
|
* @param accountId 为null时,isAdmin 为true
|
|
|
+ * @param accountBelong
|
|
|
* @param angle 1-集团视角,2-项目视角
|
|
|
* @param groupCode
|
|
|
* @param menuTree 为空时,会去查询,但是不会做权限过滤
|
|
@@ -144,13 +146,13 @@ public class SaasRoleMenuHandler {
|
|
|
* @param isAdmin 是否为超管 true-是
|
|
|
* @param menuAndFun
|
|
|
*/
|
|
|
- public void setMenuChildrens(String accountId, String groupCode, String projectId, List<SaasMenu> menuTree, List<SaasMenu> parents, boolean isAdmin, boolean menuAndFun) {
|
|
|
+ public void setMenuChildrens(String accountId, String accountBelong, String groupCode, String projectId, List<SaasMenu> menuTree, List<SaasMenu> parents, boolean isAdmin, boolean menuAndFun) {
|
|
|
for (SaasMenu parent : parents) {
|
|
|
if (StringUtil.isBlank(parent.getMenuId())) {
|
|
|
parent.setMenuId(parent.getId());
|
|
|
}
|
|
|
if (StringUtil.isNotBlank(parent.getMenuUrl())) {
|
|
|
- this.saasProductHandler.queryMenuProductAuths(parent, accountId, groupCode, projectId, isAdmin, menuAndFun);
|
|
|
+ this.saasProductHandler.queryMenuProductAuths(parent, accountId, accountBelong, groupCode, projectId, isAdmin, menuAndFun);
|
|
|
}
|
|
|
|
|
|
List<SaasMenu> childrens = null;
|
|
@@ -170,7 +172,7 @@ public class SaasRoleMenuHandler {
|
|
|
}
|
|
|
}
|
|
|
parent.setChildrens(childrens);
|
|
|
- this.setMenuChildrens(accountId, groupCode, projectId, menuTree, childrens, isAdmin, menuAndFun);
|
|
|
+ this.setMenuChildrens(accountId, accountBelong, groupCode, projectId, menuTree, childrens, isAdmin, menuAndFun);
|
|
|
}
|
|
|
}
|
|
|
|