From 78e1a6ea1cf87740f62ab8d5ae9a26b831f1727e Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 04 Dec 2021 20:36:45 +0800
Subject: [PATCH] 用户查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 25 +++++++++++++++++++++----
1 files changed, 21 insertions(+), 4 deletions(-)
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 d6b0830..05ab186 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -222,15 +222,20 @@
blade_role br
on
br.id = bu.role_id
+ left join
+ sys_information si
+ on
+ bd.id = si.departmentid
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
where
bu.is_deleted = 0
and
br.role_alias = '安保人员'
and
bu.status = 1
- and bd.parent_id!=1425365577303621633
- and bd.id != 1425365577303621633
- and bd.id != 1432625856013971457
<if test="user.cardid!=null and user.cardid != ''">
and bu.cardid like concat(concat('%', #{user.cardid}),'%')
</if>
@@ -242,6 +247,18 @@
</if>
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
+ </if>
+ <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ and (sj.id = #{user.jurisdiction} or sj.parent_id = #{user.jurisdiction})
+ </if>
+ <if test="user.dispatch!=null and user.dispatch != ''">
+ and bu.dispatch = #{user.dispatch}
+ </if>
+ <if test="user.soil!=null and user.soil != ''">
+ and bu.soil = #{user.soil}
+ </if>
+ <if test="user.insurance!=null and user.insurance != ''">
+ and bu.insurance = #{user.insurance}
</if>
<if test="user.userType!=null and user.userType != ''">
and bu.user_type = #{user.userType}
@@ -258,7 +275,7 @@
<if test="user.hold!=null and user.hold != ''">
and bu.hold = #{user.hold}
</if>
- <if test="user.jurisdiction!=null and user.jurisdiction != ''">
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction != '1372091709474910209'">
and bu.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.securitynumber!=null and user.securitynumber != ''">
--
Gitblit v1.9.3