From 804764fa08951636d118377923c7fddfccc4f643 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 04 Dec 2021 16:28:41 +0800
Subject: [PATCH] 保安员查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 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 1c06f2e..dda3727 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -215,15 +215,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>
@@ -235,6 +240,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}
@@ -257,7 +274,7 @@
<if test="user.securitynumber!=null and user.securitynumber != ''">
and bu.securitynumber like concat('%', #{user.securitynumber},'%')
</if>
- <if test="user.deptId!=null and user.deptId!=''">
+ <if test="user.deptId!=null and user.deptId!='' and user.deptId!='1460129345988239362'">
and bu.dept_id =#{user.deptId}
</if>
<if test="user.type!=null">
@@ -378,7 +395,7 @@
and bd.parent_id!=1425365577303621633
and bd.id != 1425365577303621633
and bd.id != 1432625856013971457
- <if test="user.deptId!=null and user.deptId!=''">
+ <if test="user.deptId!=null and user.deptId!='' and user.deptId!='1460129345988239362'">
and bd.id in
(
select id from blade_dept where id = #{user.deptId}
--
Gitblit v1.9.3