From 30df94c05573a426d030510d4dd58ae1d93bfb7a Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 14:03:37 +0800
Subject: [PATCH] 1.资格审查排序

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   76 +++++++++++++++++++++++++++++++++----
 1 files changed, 67 insertions(+), 9 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 e383d75..027806e 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
@@ -52,10 +52,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 
 import static org.springblade.common.constant.CommonConstant.DEFAULT_PARAM_PASSWORD;
 
@@ -423,8 +420,8 @@
 	}
 
 	@Override
-	public void updateUser(String hold, String cardid) {
-		baseMapper.updateUser(hold, cardid);
+	public void updateUser(String hold, String cardid, String holdv, String time) {
+		baseMapper.updateUser(hold, cardid, holdv, time);
 	}
 
 
@@ -432,8 +429,69 @@
 	 * 自定义用户列表(只有保安员)
 	 */
 	@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));
+	public IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user) {
+		return page.setRecords(baseMapper.selectUserPageSecurity(page, user));
 	}
+
+	/**
+	 * 查询所有未注销用户
+	 *
+	 * @return
+	 */
+	@Override
+	public List<User> getAllUserList() {
+		return baseMapper.getAllUserList();
+	}
+
+	/**
+	 * 查询用户数据,未删除的,未审核的
+	 *
+	 * @return
+	 */
+	@Override
+	public List<User> getNotAuditAllUserList() {
+		return baseMapper.getNotAuditAllUserList();
+	}
+
+	/**
+	 * 自定义列表，...
+	 *
+	 * @param page
+	 * @param user
+	 * @return
+	 */
+	@Override
+	public IPage<User> selectUserPages(IPage<User> page, User user) {
+		return page.setRecords(baseMapper.selectUserPages(page, user));
+	}
+
+	/**
+	 * 根据保安员编码查询保安员信息
+	 *
+	 * @param securityNumber
+	 * @return
+	 */
+	@Override
+	public UserVO getUserInfoBySecurityNumber(String securityNumber) {
+		return baseMapper.getUserInfoBySecurityNumber(securityNumber);
+	}
+
+
+	/**
+	 * 通过 身份证号查询用户信息
+	 *
+	 * @param idCardNo 身份证号
+	 * @return
+	 */
+	@Override
+	public User getUserInfoByIdCardNo(String idCardNo) {
+		return baseMapper.getUserInfoByIdCardNo(idCardNo);
+	}
+
+	@Override
+	public List selectPeo(UserVO user) {
+		return baseMapper.selectPeo(user);
+	}
+
+
 }

--
Gitblit v1.9.3