|
|
|
@@ -75,7 +75,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<Long> queryAdminMenuList(MallUserInfo userInfo) { |
|
|
|
if(userInfo.isFmSuperAdmin() || |
|
|
|
if(userInfo.fmSuperAdmin() || |
|
|
|
userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { |
|
|
|
WxMall q = new WxMall() {{ |
|
|
|
if (StringUtils.isBlank(userInfo.getParentTenantId())) { |
|
|
|
@@ -97,7 +97,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { |
|
|
|
@Override |
|
|
|
public List<Long> queryUserMenuIds(MallUserInfo userInfo, Long parentId, boolean boolNav) { |
|
|
|
List<Long> mpList = new ArrayList<Long>(); |
|
|
|
if(userInfo.isFmSuperAdmin() || |
|
|
|
if(userInfo.fmSuperAdmin() || |
|
|
|
userInfo.checkAdmin()) { |
|
|
|
List<MallPermission> mps = getAllMenuListByParentId(parentId, null, boolNav); |
|
|
|
mps.stream().forEach(mp->{ |
|
|
|
@@ -116,7 +116,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { |
|
|
|
|
|
|
|
@Override |
|
|
|
public List<MallPermission> getUserMenuList(MallUserInfo userInfo, Long parentId, boolean boolNav) { |
|
|
|
if(userInfo.isFmSuperAdmin()) { |
|
|
|
if(userInfo.fmSuperAdmin()) { |
|
|
|
// 富茂系统管理员,返回所有菜单 |
|
|
|
return getAllMenuListByParentId(parentId, null, boolNav); |
|
|
|
} else if (userInfo.checkGroupAdmin()) { |
|
|
|
|