From 3432fad3ebcecd73d3d50fa8dfb7934cc61cfd06 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 16 Aug 2021 15:04:16 +0800
Subject: [PATCH] 保安员查询新增审查排序

---
 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java |   11 ++++++++++-
 1 files changed, 10 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 e383d75..309a5a8 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
@@ -432,8 +432,17 @@
 	 * 自定义用户列表(只有保安员)
 	 */
 	@Override
-	public IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String tenantId) {
+	public IPage<UserVO> selectUserPageSecurity(IPage<UserVO> page, UserVO user, Long deptId, String tenantId) {
 		List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
 		return page.setRecords(baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId));
 	}
+
+	/**
+	 * 查询所有未注销用户
+	 * @return
+	 */
+	@Override
+	public List<User> getAllUserList() {
+		return baseMapper.getAllUserList();
+	}
 }

--
Gitblit v1.9.3