diff --git a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java index 3b5d3d7dc..920a024ff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java @@ -108,7 +108,7 @@ public class MallUserInfo extends TenantEntity { * 富茂超管 * @return */ - public boolean isFmSuperAdmin() { + public boolean fmSuperAdmin() { if(StringUtils.isBlank(getTenantId())) { return false; } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java index 5b0d68812..a2b40e3ca 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -75,7 +75,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { @Override public List 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 queryUserMenuIds(MallUserInfo userInfo, Long parentId, boolean boolNav) { List mpList = new ArrayList(); - if(userInfo.isFmSuperAdmin() || + if(userInfo.fmSuperAdmin() || userInfo.checkAdmin()) { List mps = getAllMenuListByParentId(parentId, null, boolNav); mps.stream().forEach(mp->{ @@ -116,7 +116,7 @@ public class MallPermissionServiceImpl implements MallPermissionService { @Override public List getUserMenuList(MallUserInfo userInfo, Long parentId, boolean boolNav) { - if(userInfo.isFmSuperAdmin()) { + if(userInfo.fmSuperAdmin()) { // 富茂系统管理员,返回所有菜单 return getAllMenuListByParentId(parentId, null, boolNav); } else if (userInfo.checkGroupAdmin()) { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java index c9b8faba0..b444caee8 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java @@ -300,7 +300,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService { @Override public Set getUserPermissions(MallUserInfo record, boolean boolNav) { List permsList; - if(record.isFmSuperAdmin()) { + if(record.fmSuperAdmin()) { // 富茂超管 MallPermission q = new MallPermission(); q.setAvailable("Y");