From 94509a9beca98a7b1bb96ccbad2e9b0f1570045d Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 16 Jul 2020 14:59:32 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E6=9D=83=E9=99=90=E8=A7=92?= =?UTF-8?q?=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/sys/MallRoleController.java | 4 ++-- .../com/iformall/controller/sys/MallUserInfoController.java | 2 +- .../java/com/iformall/controller/sys/SysMenuController.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java index c627aef99..70125f588 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallRoleController.java @@ -52,7 +52,7 @@ public class MallRoleController extends BaseController { @SystemControllerLog(description = "用户管理-role列表") public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallRoleController::list"); - sysRole.updateTenantInfo(getTenantInfo()); + sysRole.updateTenantInfo(ifParentUpdateTenantInfo()); sysRole.setSortColumns(BaseEntity.SortField.Id_DESC); final PageInfo page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); for (MallRole r : page.getList()) { @@ -84,7 +84,7 @@ public class MallRoleController extends BaseController { MallRole role = sysRoleService.getById(sysRole.getId()); MallRolePermission p = new MallRolePermission(); p.setRoleId(role.getId()); - p.updateTenantInfo(getTenantInfo()); + p.updateTenantInfo(ifParentUpdateTenantInfo()); List pers = sysRolePermissionService.getList(p); String menus = ""; for (MallRolePermission rp : pers) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java index 60dbc70f0..39158e41d 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/MallUserInfoController.java @@ -70,7 +70,7 @@ public class MallUserInfoController extends BaseController { public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); - userInfo.updateTenantInfo(getTenantInfo()); + userInfo.updateTenantInfo(ifParentUpdateTenantInfo()); userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); final PageInfo page = userInfoService.listAsPage(userInfo, pageNum, pageSize); for (MallUserInfo u : page.getList()) { 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 a98c0cbe7..cbba72d38 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/sys/SysMenuController.java @@ -73,7 +73,7 @@ public class SysMenuController extends BaseController { logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); MallUserInfo user = getUser(); if (user.checkGroupAdmin()) { - TenantEntity tenantEntity = getTenantInfo(); + TenantEntity tenantEntity = ifParentUpdateTenantInfo(); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { user.setParentTenantId(tenantEntity.getParentTenantId()); }