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/mapper/UserMapper.xml | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
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
--
Gitblit v1.9.3