From 0dee81f06575d115d64adde8fc3a4ea94607f9ef Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 06 Aug 2021 11:44:17 +0800
Subject: [PATCH] 1.考试报名新增判断，同一人，同一场考试，已报名且未考试，审核通过和待审核的不能再次报名 2.考试接口修改

---
 src/main/java/org/springblade/modules/system/service/IUserService.java |    7 ++++++-
 1 files changed, 6 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 405a22b..882e1e7 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);
 
 	/**
 	 * 自定义分页
@@ -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