Browse Source

角色权限

release_toaliyun_real
xhxu 5 years ago
parent
commit
16a8470c48
2 changed files with 6 additions and 5 deletions
  1. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java
  2. +5
    -5
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java

+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java View File

@@ -74,6 +74,7 @@ public class SysMenuController extends BaseController {
MallUserInfo user = getUser();
if (user.checkGroupAdmin()) {
TenantEntity tenantEntity = ifParentUpdateTenantInfo();
user.setTenantId(tenantEntity.getTenantId());
if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) {
user.setParentTenantId(tenantEntity.getParentTenantId());
}


+ 5
- 5
mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java View File

@@ -121,17 +121,17 @@ public class MallPermissionServiceImpl implements MallPermissionService {
return getAllMenuListByParentId(parentId, null, boolNav);
} else if (userInfo.checkGroupAdmin()) {
// 集团超管
if (boolNav) {
// if (boolNav) {
WxMall q = new WxMall() {{
setTenantId(userInfo.getTenantId());
}};
String menus = wxMallMapper.queryMenusByTenantInfo(q);
JSONArray menuIdList = JSON.parseArray(menus);
return getAllMenuListByParentId(0L, menuIdList.toJavaList(Long.class), boolNav);
} else {
// 配置菜单时, 返回所有菜单
return getAllMenuListByParentId(parentId, null, boolNav);
}
// } else {
// // 配置菜单时, 返回所有菜单
// return getAllMenuListByParentId(parentId, null, boolNav);
// }
} else if (userInfo.checkAdmin()) {
// 租户超管
WxMall q = new WxMall() {{


Loading…
Cancel
Save