diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java index 79eebd6e0..28d073dd7 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxMallMapper.java @@ -11,4 +11,6 @@ public interface WxMallMapper extends CommonMapper { WxMall getByTenantId(String tenantId); + String queryMenusByTenantId(String tenantId); + } 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 74b7a460f..7a3af0bab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -1,5 +1,7 @@ package com.iformall.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -7,10 +9,11 @@ import com.iformall.common.IdWorker; import com.iformall.domain.po.MallPermission; import com.iformall.domain.po.MallUserInfo; import com.iformall.enums.EnumPermissionType; +import com.iformall.enums.EnumUserAdmin; import com.iformall.mapper.MallPermissionMapper; import com.iformall.mapper.MallUserInfoMapper; +import com.iformall.mapper.WxMallMapper; import com.iformall.service.MallPermissionService; -import com.iformall.utils.Constant; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -24,10 +27,13 @@ public class MallPermissionServiceImpl implements MallPermissionService { private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired - MallPermissionMapper mallPermissionMapper; + private MallPermissionMapper mallPermissionMapper; @Autowired - MallUserInfoMapper mallUserInfoMapper; + private MallUserInfoMapper mallUserInfoMapper; + + @Autowired + private WxMallMapper wxMallMapper; @Override public List queryListParentId(Long parentId, List menuIdList) { @@ -61,6 +67,12 @@ public class MallPermissionServiceImpl implements MallPermissionService { // 富茂超级管理员,返回所有菜单 return getAllMenuList(null); } + if(userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) { + // 租户超管 + String menus = wxMallMapper.queryMenusByTenantId(userInfo.getTenantId()); + JSONArray menuIdList = JSON.parseArray(menus); + return getAllMenuList(menuIdList.toJavaList(Long.class)); + } //用户菜单列表 List menuIdList = mallUserInfoMapper.queryAllMenuId(userInfo.getId()); return getAllMenuList(menuIdList); diff --git a/mallinkService/src/main/resources/mapper/WxMallMapper.xml b/mallinkService/src/main/resources/mapper/WxMallMapper.xml index 46d357a3f..68ae0f73f 100644 --- a/mallinkService/src/main/resources/mapper/WxMallMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMallMapper.xml @@ -137,5 +137,13 @@ where 1=1 and `tenant_id` = #{value} + + + String queryMenusByTenantId(String tenantId); +