| @@ -52,7 +52,7 @@ public class MallRoleController extends BaseController { | |||||
| @SystemControllerLog(description = "用户管理-role列表") | @SystemControllerLog(description = "用户管理-role列表") | ||||
| public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { | public ResultData list(MallRole sysRole, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] MallRoleController::list"); | logger.debug("[" + getIpAddr() + "] MallRoleController::list"); | ||||
| sysRole.updateTenantInfo(getTenantInfo()); | |||||
| sysRole.updateTenantInfo(ifParentUpdateTenantInfo()); | |||||
| sysRole.setSortColumns(BaseEntity.SortField.Id_DESC); | sysRole.setSortColumns(BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<MallRole> page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); | final PageInfo<MallRole> page = sysRoleService.listAsPage(sysRole, pageNum, pageSize); | ||||
| for (MallRole r : page.getList()) { | for (MallRole r : page.getList()) { | ||||
| @@ -84,7 +84,7 @@ public class MallRoleController extends BaseController { | |||||
| MallRole role = sysRoleService.getById(sysRole.getId()); | MallRole role = sysRoleService.getById(sysRole.getId()); | ||||
| MallRolePermission p = new MallRolePermission(); | MallRolePermission p = new MallRolePermission(); | ||||
| p.setRoleId(role.getId()); | p.setRoleId(role.getId()); | ||||
| p.updateTenantInfo(getTenantInfo()); | |||||
| p.updateTenantInfo(ifParentUpdateTenantInfo()); | |||||
| List<MallRolePermission> pers = sysRolePermissionService.getList(p); | List<MallRolePermission> pers = sysRolePermissionService.getList(p); | ||||
| String menus = ""; | String menus = ""; | ||||
| for (MallRolePermission rp : pers) { | for (MallRolePermission rp : pers) { | ||||
| @@ -70,7 +70,7 @@ public class MallUserInfoController extends BaseController { | |||||
| public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { | public ResultData listAsPage(MallUserInfo userInfo, Integer pageNum, Integer pageSize) { | ||||
| logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); | logger.debug("[" + getIpAddr() + "] MallUserInfoController::listAsPage"); | ||||
| userInfo.updateTenantInfo(getTenantInfo()); | |||||
| userInfo.updateTenantInfo(ifParentUpdateTenantInfo()); | |||||
| userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | userInfo.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | final PageInfo<MallUserInfo> page = userInfoService.listAsPage(userInfo, pageNum, pageSize); | ||||
| for (MallUserInfo u : page.getList()) { | for (MallUserInfo u : page.getList()) { | ||||
| @@ -73,7 +73,7 @@ public class SysMenuController extends BaseController { | |||||
| logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); | logger.debug("[" + getIpAddr() + "] MallPermissionController::list"); | ||||
| MallUserInfo user = getUser(); | MallUserInfo user = getUser(); | ||||
| if (user.checkGroupAdmin()) { | if (user.checkGroupAdmin()) { | ||||
| TenantEntity tenantEntity = getTenantInfo(); | |||||
| TenantEntity tenantEntity = ifParentUpdateTenantInfo(); | |||||
| if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { | ||||
| user.setParentTenantId(tenantEntity.getParentTenantId()); | user.setParentTenantId(tenantEntity.getParentTenantId()); | ||||
| } | } | ||||