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/impl/UserServiceImpl.java |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 3ab1c72..082e474 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -140,7 +140,7 @@
 	}
 
 	@Override
-	public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
+	public IPage<UserVO> selectUserPage(IPage<UserVO> page, User user, Long deptId, String tenantId) {
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
 		return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
 	}
@@ -422,4 +422,28 @@
 		return userVO;
 	}
 
+	/**
+	 * 通过 身份证号查询用户信息
+	 * @param idCardNo 身份证号
+	 * @return
+	 */
+	@Override
+	public User getUserInfoByIdCardNo(String idCardNo) {
+		return baseMapper.getUserInfoByIdCardNo(idCardNo);
+	}
+
+	@Override
+	public IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String tenantId) {
+		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+		return page.setRecords(baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId));
+	}
+
+	/**
+	 * 自定义用户列表(只有保安员),根据保安员查
+	 */
+	@Override
+	public List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String tenantId) {
+		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+		return baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId);
+	}
 }

--
Gitblit v1.9.3