From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   23 ++++++++++++++++++++++-
 1 files changed, 22 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 6e1be84..c0fbc10 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -211,11 +211,32 @@
 	/**
 	 * 自定义用户列表(只有保安员)
 	 */
-	IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user, Long deptId, String s);
+	IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user);
 
 	/**
 	 * 查询所有未注销用户
 	 * @return
 	 */
 	List<User> getAllUserList();
+
+	/**
+	 * 查询用户数据,未删除的,未审核的
+	 * @return
+	 */
+	List<User> getNotAuditAllUserList();
+
+	/**
+	 * 自定义列表，...
+	 * @param page
+	 * @param user
+	 * @return
+	 */
+	IPage<User> selectUserPages(IPage<User> page, User user);
+
+	/**
+	 * 根据保安员编码查询保安员信息
+	 * @param securityNumber
+	 * @return
+	 */
+    UserVO getUserInfoBySecurityNumber(String securityNumber);
 }

--
Gitblit v1.9.3