From 780ec2ea0b558c5603012abbfb8c1fa9845e6734 Mon Sep 17 00:00:00 2001 From: tangzy <tangzy123456> Date: Fri, 30 Jul 2021 18:04:58 +0800 Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_management_w --- src/main/java/org/springblade/modules/system/service/IUserService.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java index 405a22b..882e1e7 100644 --- a/src/main/java/org/springblade/modules/system/service/IUserService.java +++ b/src/main/java/org/springblade/modules/system/service/IUserService.java @@ -71,7 +71,7 @@ * @param tenantId * @return */ - IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId); + IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId); /** * 自定义分页 @@ -218,4 +218,9 @@ * 自定义用户列表(只有保安员) */ IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String s); + + /** + * 自定义用户列表(只有保安员),根据保安员查 + */ + List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String s); } -- Gitblit v1.9.3