From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001 From: zengh <123456> Date: Thu, 19 Aug 2021 15:03:05 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/org/springblade/modules/system/service/IUserService.java | 12 ++++++------ 1 files changed, 6 insertions(+), 6 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 b723a26..75d7b26 100644 --- a/src/main/java/org/springblade/modules/system/service/IUserService.java +++ b/src/main/java/org/springblade/modules/system/service/IUserService.java @@ -69,11 +69,9 @@ * * @param page * @param user - * @param deptId - * @param tenantId * @return */ - IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user, Long deptId, String tenantId); + IPage<UserVO> selectUserPages(IPage<UserVO> page, UserVO user); /** * 自定义分页 @@ -230,12 +228,12 @@ /** * 自定义用户列表(只有保安员) */ - IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String s); + IPage<User> selectUserPageSecurity(IPage<User> page, User user); /** * 自定义用户列表(只有保安员),根据保安员查 */ - List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String s); + List<User> selectUserPageSecurityUnit(IPage<User> page, User user); /** * 保安员列表，帅选无保安证 @@ -245,7 +243,7 @@ * @param s * @return */ - IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user, Long deptId, String s); + IPage<UserVO> selectUserPageSecurityApply(IPage<UserVO> page, UserVO user); /** * 保安员列表树 安员列表树，帅选无保安证,下拉tree @@ -277,4 +275,6 @@ * @return */ UserVO getUserAgeById(Long userId); + + List<Map<String, Object>> selectUser(); } -- Gitblit v1.9.3