From 16a8470c48b7520ca72acbd6e113cff3aa9cfe71 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 21 Jul 2020 10:50:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/sys/SysMenuController.java | 1 + .../service/impl/MallPermissionServiceImpl.java | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java index cbba72d38..ce8bd4740 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -74,6 +74,7 @@ public class SysMenuController extends BaseController { MallUserInfo user = getUser(); if (user.checkGroupAdmin()) { TenantEntity tenantEntity = ifParentUpdateTenantInfo(); + user.setTenantId(tenantEntity.getTenantId()); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { user.setParentTenantId(tenantEntity.getParentTenantId()); } 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 7fa6689b7..b8d86770f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java @@ -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() {{