From 4dd54344d990773acd4e5f3c53dc21e8f82acba6 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 28 Jul 2021 15:33:17 +0800
Subject: [PATCH] 保安列表修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 74c9fdc..47720f3 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -124,7 +124,7 @@
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, "000000");
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -322,7 +322,7 @@
public R<IPage<UserVO>> pageSecurity(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
user.setAccount("admin");
bladeUser.setTenantId("000000");
- IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, "000000");
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -333,7 +333,7 @@
public List<User> pageSecurityUnit(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
user.setAccount("admin");
bladeUser.setTenantId("000000");
- List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user, deptId, "000000");
return pages;
}
--
Gitblit v1.9.3