Parcourir la source

tt

release_toaliyun_real
xhxu il y a 5 ans
Parent
révision
1863692ba4
3 fichiers modifiés avec 5 ajouts et 5 suppressions
  1. +1
    -1
      mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java
  2. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java

+ 1
- 1
mallinkService/src/main/java/com/iformall/domain/po/MallUserInfo.java Voir le fichier

@@ -108,7 +108,7 @@ public class MallUserInfo extends TenantEntity {
* 富茂超管 * 富茂超管
* @return * @return
*/ */
public boolean isFmSuperAdmin() {
public boolean fmSuperAdmin() {
if(StringUtils.isBlank(getTenantId())) { if(StringUtils.isBlank(getTenantId())) {
return false; return false;
} }


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java Voir le fichier

@@ -75,7 +75,7 @@ public class MallPermissionServiceImpl implements MallPermissionService {


@Override @Override
public List<Long> queryAdminMenuList(MallUserInfo userInfo) { public List<Long> queryAdminMenuList(MallUserInfo userInfo) {
if(userInfo.isFmSuperAdmin() ||
if(userInfo.fmSuperAdmin() ||
userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) {
WxMall q = new WxMall() {{ WxMall q = new WxMall() {{
if (StringUtils.isBlank(userInfo.getParentTenantId())) { if (StringUtils.isBlank(userInfo.getParentTenantId())) {
@@ -97,7 +97,7 @@ public class MallPermissionServiceImpl implements MallPermissionService {
@Override @Override
public List<Long> queryUserMenuIds(MallUserInfo userInfo, Long parentId, boolean boolNav) { public List<Long> queryUserMenuIds(MallUserInfo userInfo, Long parentId, boolean boolNav) {
List<Long> mpList = new ArrayList<Long>(); List<Long> mpList = new ArrayList<Long>();
if(userInfo.isFmSuperAdmin() ||
if(userInfo.fmSuperAdmin() ||
userInfo.checkAdmin()) { userInfo.checkAdmin()) {
List<MallPermission> mps = getAllMenuListByParentId(parentId, null, boolNav); List<MallPermission> mps = getAllMenuListByParentId(parentId, null, boolNav);
mps.stream().forEach(mp->{ mps.stream().forEach(mp->{
@@ -116,7 +116,7 @@ public class MallPermissionServiceImpl implements MallPermissionService {


@Override @Override
public List<MallPermission> getUserMenuList(MallUserInfo userInfo, Long parentId, boolean boolNav) { public List<MallPermission> getUserMenuList(MallUserInfo userInfo, Long parentId, boolean boolNav) {
if(userInfo.isFmSuperAdmin()) {
if(userInfo.fmSuperAdmin()) {
// 富茂系统管理员,返回所有菜单 // 富茂系统管理员,返回所有菜单
return getAllMenuListByParentId(parentId, null, boolNav); return getAllMenuListByParentId(parentId, null, boolNav);
} else if (userInfo.checkGroupAdmin()) { } else if (userInfo.checkGroupAdmin()) {


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/MallUserInfoServiceImpl.java Voir le fichier

@@ -300,7 +300,7 @@ public class MallUserInfoServiceImpl implements MallUserInfoService {
@Override @Override
public Set<String> getUserPermissions(MallUserInfo record, boolean boolNav) { public Set<String> getUserPermissions(MallUserInfo record, boolean boolNav) {
List<String> permsList; List<String> permsList;
if(record.isFmSuperAdmin()) {
if(record.fmSuperAdmin()) {
// 富茂超管 // 富茂超管
MallPermission q = new MallPermission(); MallPermission q = new MallPermission();
q.setAvailable("Y"); q.setAvailable("Y");


Chargement…
Annuler
Enregistrer