|
|
|
@@ -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() {{ |
|
|
|
|