From c62d8002bec6dfd520649a435085dc1f7e3ce147 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Wed, 01 Dec 2021 10:36:19 +0800
Subject: [PATCH] 1.押运

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   70 +++++++++++++++++++++++++++++++++--
 1 files changed, 66 insertions(+), 4 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 972d1e2..163a957 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
@@ -41,6 +41,7 @@
 import org.springblade.core.tool.utils.*;
 import org.springblade.modules.auth.enums.UserEnum;
 import org.springblade.modules.system.entity.*;
+import org.springblade.modules.system.excel.SecurityExcel;
 import org.springblade.modules.system.excel.UserExcel;
 import org.springblade.modules.system.mapper.UserMapper;
 import org.springblade.modules.system.service.IRoleService;
@@ -52,10 +53,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;
 
@@ -427,4 +425,68 @@
 		baseMapper.updateUser(hold, cardid);
 	}
 
+
+	/**
+	 * 自定义用户列表(只有保安员)
+	 */
+	@Override
+	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 user
+	 * @return
+	 */
+	@Override
+	public List<SecurityExcel> exportSecurity(UserVO user) {
+		return baseMapper.exportSecurity(user);
+	}
+
+	@Override
+	public List selectPeo(UserVO user) {
+		return baseMapper.selectPeo(user);
+	}
+
+
 }

--
Gitblit v1.9.3