From 42fa84804a890600b4f6d7b24ddc094c19c645ba Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 26 Mar 2021 09:34:15 +0800
Subject: [PATCH] 安保人员查询（多级查询与附带坐标）
---
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java | 4 ++--
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 16 +++++-----------
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 2 +-
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java | 4 ++--
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java | 4 ++--
5 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index 457c3b9..e6820a0 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -138,7 +138,7 @@
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId);
return R.data(UserWrapper.build().pageVO(pages));
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
index 58f59f8..d6fc19d 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.java
@@ -49,10 +49,10 @@
* @param page
* @param user
* @param deptIdList
- * @param tenantId
+ * @param
* @return
*/
- List<User> selectUserPages(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
+ List<User> selectUserPages(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList);
/**
* 获取用户
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index ad66bd4..36c8f8a 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -96,24 +96,18 @@
LEFT JOIN jfpt.sys_position p ON p.snumber = s.CODE
LEFT JOIN jfpt.sys_enclosure e ON e.anumber = s.CODE
- where is_deleted = 0
- <if test="tenantId!=null and tenantId != ''">
- and tenant_id = #{tenantId}
- </if>
- <if test="user.tenantId!=null and user.tenantId != ''">
- and tenant_id = #{user.tenantId}
- </if>
+ where s.is_deleted = 0
<if test="user.account!=null and user.account != ''">
- and account = #{user.account}
+ and s.account = #{user.account}
</if>
<if test="user.realName!=null and user.realName != ''">
- and real_name = #{user.realName}
+ and s.real_name = #{user.realName}
</if>
<if test="user.userType!=null and user.userType != ''">
- and user_type = #{user.userType}
+ and s.user_type = #{user.userType}
</if>
<if test="deptIdList!=null and deptIdList.size>0">
- and id in (
+ and s.id in (
SELECT
user_id
FROM
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
index 14b54e1..7915751 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
@@ -77,10 +77,10 @@
* @param page
* @param user
* @param deptId
- * @param tenantId
+ * @param
* @return
*/
- IPage<User> selectUserPages(IPage<User> page, User user, Long deptId, String tenantId);
+ IPage<User> selectUserPages(IPage<User> page, User user, Long deptId);
/**
* 用户信息
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
index 6554255..7797c6c 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
@@ -147,9 +147,9 @@
}
@Override
- public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId, String tenantId) {
+ public IPage<User> selectUserPages(IPage<User> page, User user, Long deptId) {
List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
- return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList, tenantId));
+ return page.setRecords(baseMapper.selectUserPages(page, user, deptIdList));
}
@Override
--
Gitblit v1.9.3