From bb99e8923e36dbbc2639fcc0a1a1191e2221277d Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 27 Jul 2021 15:26:28 +0800
Subject: [PATCH] 新增保安员查询接口（根据组织机构
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 9 ++++++---
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 9 ++++++++-
src/main/java/org/springblade/modules/system/controller/UserController.java | 12 ++++++++++++
src/main/java/org/springblade/modules/system/service/IUserService.java | 5 +++++
4 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 021b09b..74c9fdc 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -321,8 +321,20 @@
@GetMapping("/page-security")
public R<IPage<UserVO>> pageSecurity(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
user.setAccount("admin");
+ bladeUser.setTenantId("000000");
IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().pageVO(pages));
}
+ /**
+ * 自定义用户列表(只有保安员)
+ */
+ @GetMapping("/page-security-unit")
+ public List<User> pageSecurityUnit(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ user.setAccount("admin");
+ bladeUser.setTenantId("000000");
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ return pages;
+ }
+
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index fa8d80f..591b6a2 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -149,6 +149,9 @@
<if test="user.nativeplace!=null and user.nativeplace != ''">
and bu.nativeplace = #{user.nativeplace}
</if>
+ <if test="user.deptId!=null and user.deptId != ''">
+ and bu.dept_id = #{user.deptId}
+ </if>
<if test="user.sex!=null and user.sex != ''">
and bu.sex = #{user.sex}
</if>
@@ -158,13 +161,13 @@
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
</if> <if test="user.jurisdiction!=null and user.jurisdiction != ''">
- and bu.jurisdiction = #{user.jurisdiction}
- </if>
+ and bu.jurisdiction = #{user.jurisdiction}
+ </if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber = #{user.securitynumber}
</if>
<if test="deptIdList!=null and deptIdList.size>0">
- and id in (
+ and bu.id in (
SELECT
user_id
FROM
diff --git a/src/main/java/org/springblade/modules/system/service/IUserService.java b/src/main/java/org/springblade/modules/system/service/IUserService.java
index 405a22b..63a73f1 100644
--- a/src/main/java/org/springblade/modules/system/service/IUserService.java
+++ b/src/main/java/org/springblade/modules/system/service/IUserService.java
@@ -218,4 +218,9 @@
* 自定义用户列表(只有保安员)
*/
IPage<User> selectUserPageSecurity(IPage<User> page, User user, Long deptId, String s);
+
+ /**
+ * 自定义用户列表(只有保安员),根据保安员查
+ */
+ List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String s);
}
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 a75d1a8..7cee25a 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
@@ -438,5 +438,12 @@
return page.setRecords(baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId));
}
-
+ /**
+ * 自定义用户列表(只有保安员),根据保安员查
+ */
+ @Override
+ public List<User> selectUserPageSecurityUnit(IPage<User> page, User user, Long deptId, String tenantId) {
+ List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
+ return baseMapper.selectUserPageSecurity(page, user, deptIdList, tenantId);
+ }
}
--
Gitblit v1.9.3