From 73d958e6fc5c3cc3a74446b6cead4e3e8806ba84 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 07 May 2021 14:59:07 +0800
Subject: [PATCH] 保安筛选逻辑调整
---
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 2 +-
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 2 +-
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index cc9d7d5..bd1d254 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -137,7 +137,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId);
return R.data(UserWrapper.build().pageVO(pages));
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
index 7915751..b325bb2 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
@@ -80,7 +80,7 @@
* @param
* @return
*/
- IPage<User> selectUserPages(IPage<User> page, User user, Long deptId);
+ IPage<User> selectUserPages(IPage<User> page, User user, String deptId);
/**
* 用户信息
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 5f31e34..1edc9f8 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -145,7 +145,7 @@
}
@Override
- public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId) {
+ public IPage<User> selectUserPages(IPage<User> page, User user, String deptId) {
// List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
if (deptId != null){
String arr =deptId.toString();
--
Gitblit v1.9.3