From 3b1e22dc8460daafc2ecbae478ddcbe5ea21b944 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 18 Sep 2021 17:27:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 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..e1e88fb 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
@@ -427,4 +427,51 @@
 		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);
+	}
 }

--
Gitblit v1.9.3