From 0393a3b2b4d968b0423f0b81b0f7f8e6db75a016 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sat, 04 Dec 2021 16:04:14 +0800
Subject: [PATCH] 1.首页现实表现

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |   40 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 38 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 6e1be84..537391c 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -25,10 +25,12 @@
 import org.springblade.modules.system.entity.User;
 import org.springblade.modules.system.entity.UserInfo;
 import org.springblade.modules.system.entity.UserOauth;
+import org.springblade.modules.system.excel.SecurityExcel;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.vo.UserVO;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 服务类
@@ -70,7 +72,7 @@
 	 * @param tenantId
 	 * @return
 	 */
-	IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
+	IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);
 
 	/**
 	 * 自定义分页
@@ -211,11 +213,45 @@
 	/**
 	 * 自定义用户列表(只有保安员)
 	 */
-	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);
+
+	/**
+	 * 导出用户审查明细
+	 * @param user
+	 * @return
+	 */
+	List<SecurityExcel> exportSecurity(UserVO user);
+	/**
+	 * 查询押运人员编码不为null的保安信息
+	 * @return
+	 */
+	List selectPeo(UserVO user);
+
 }

--
Gitblit v1.9.3