From 0cab6d8afcc97e8bc94ef200e24d8839281f44c8 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sun, 15 Aug 2021 15:22:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 18 ++++++++++++++++++
1 files changed, 18 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..3e6cdb8 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,22 @@
baseMapper.updateUser(hold, cardid);
}
+
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ @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));
+ }
+
+ /**
+ * 查询所有未注销用户
+ * @return
+ */
+ @Override
+ public List<User> getAllUserList() {
+ return baseMapper.getAllUserList();
+ }
}
--
Gitblit v1.9.3