From d3503e14d4af528d462afdefc67456f50721fbdd Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 14 Sep 2021 09:56:17 +0800
Subject: [PATCH] 智能分析统计接口辖区id更改，本市保安公司辖区id修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 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 f91676f..e08b0f0 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -75,6 +75,9 @@
br.id = bu.role_id
where
bu.is_deleted = 0
+ and bd.parent_id!=1425365577303621633
+ and bd.id != 1425365577303621633
+ and bd.id != 1432625856013971457
<if test="user.account!=null and user.account != ''">
and bu.account like concat('%', #{user.account},'%')
</if>
@@ -93,7 +96,7 @@
<if test="user.status!=null and user.status != ''">
and bu.status = #{user.status}
</if>
- <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1123598813738675201'">
+ <if test="user.jurisdiction!=null and user.jurisdiction != '' and user.jurisdiction!='1372091709474910209'">
and si.jurisdiction = #{user.jurisdiction}
</if>
<if test="user.realName!=null and user.realName != ''">
@@ -219,7 +222,6 @@
br.id = bu.role_id
where
bu.is_deleted = 0
- and bd.dept_category = 1
and role_alias = '保安'
<if test="user.realName!=null and user.realName != ''">
and bu.real_name like concat(concat('%', #{user.realName}),'%')
@@ -269,14 +271,12 @@
where
bu.is_deleted = 0
and
- bd.dept_category = 1
- and
(hold = 2 or hold = 3)
<if test="user.deptId!=null and user.deptId != ''">
and bu.dept_id = #{user.deptId}
</if>
<if test="user.isApply!=null">
- and sa.is_apply = #{user.isApply}
+ and bu.is_apply = #{user.isApply}
</if>
<if test="user.roleId!=null and user.roleId != ''">
and bu.role_id = #{user.roleId}
@@ -324,7 +324,6 @@
bu.is_deleted = 0
and bu.status = 1
and bu.examination_type != 1
- and bd.dept_category = 1
and (hold = 2 or hold = 3)
and bd.id = #{user.deptId}
<if test="user.examType==1">
@@ -442,6 +441,10 @@
sys_information si
on
bd.id = si.departmentid
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
1=1
and bu.status = 1
@@ -451,7 +454,7 @@
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
and si.jurisdiction = #{jurisdiction}
- and dept_category=2
+ and br.role_alias = "公安管理员"
</if>
</select>
@@ -463,6 +466,10 @@
blade_dept bd
on
bd.id = bu.dept_id
+ left join
+ blade_role br
+ on
+ br.id = bu.role_id
where
1=1
and bu.status = 1
@@ -472,7 +479,7 @@
</if>
<if test="jurisdiction!=null and jurisdiction!=''">
and bu.jurisdiction = #{jurisdiction}
- and dept_category=2
+ and br.role_alias = "公安管理员"
</if>
</select>
--
Gitblit v1.9.3