From b7624be989e599505cdf2ccf4f43f3ac952733f0 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 17 Sep 2023 16:37:54 +0800
Subject: [PATCH] 角色查询修改，只查询当前角色下级角色，用户查询排除超级管理员查询，角色数查询除超级管理员查询查全部外，其他角色只查询当有有的权限菜单
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 29d9ce7..86855ce 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -199,11 +199,8 @@
})
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
- //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- System.out.println("在线更新代码.... ");
- IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
- System.out.println("=================在线更新代码==================");
+ public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId) {
+ IPage<UserVO> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (AuthUtil.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : AuthUtil.getTenantId()));
return R.data(pages);
}
--
Gitblit v1.9.3