From 08363052cecb30230a2c8b3eba791ca8d1be00a5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 15:32:38 +0800
Subject: [PATCH] 二维码生成地址修改，保安证编码生成修改

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 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..81613ed 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,28 @@
 	 * @return
 	 */
 	UserVO getUserAgeById(Long userId);
+
+	List<Map<String, Object>> selectUser();
+
+	/**
+	 * 导入保安员
+	 * @param data
+	 * @param isCovered
+	 */
+	void importSecurity(List<UserExcel> data, Boolean isCovered);
+
+	/**
+	 * 根据保安员编码查询保安信息
+	 * @param securityNumber 保安证编码
+	 * @return
+	 */
+    UserVO getUserInfoBySecurityNumber(String securityNumber);
+
+	/**
+	 * 保安员信息
+	 * @param user
+	 * @return
+	 */
+    UserVO getUserDetails(User user);
+	List<Map<String, Object>> seleL(String type,String deptid,String jurisdiction,Long userId);
 }

--
Gitblit v1.9.3