From 43c71c228dcd806c9dd8303d133ca4b3ba9c1275 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 09 Aug 2021 17:24:18 +0800
Subject: [PATCH] 1.保安员导入

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |    9 +++++++--
 1 files changed, 7 insertions(+), 2 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..b3fd83a 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);
 
 	/**
 	 * 自定义分页
@@ -179,7 +179,7 @@
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<UserExcel> exportUser(Wrapper<User> queryWrapper);
+	//List<UserExcel> exportUser(Wrapper<User> queryWrapper);
 
 	/**
 	 * 注册用户
@@ -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