From fd4e3e2d5343a01a4f24e256f5fe21728e4d1536 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Tue, 31 Aug 2021 16:38:52 +0800
Subject: [PATCH] 1.社保
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
index df326a6..2a06a19 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -127,7 +127,7 @@
1=1
and (stats = 1 or stats =2 or stats =4)
AND dept.is_deleted = 0
- <if test="param1!=null and param1!=''">
+ <if test="param1!=null and param1!='' and param1!='1123598813738675201'">
and si.jurisdiction = #{param1}
</if>
ORDER BY dept.sort
@@ -224,6 +224,7 @@
bd.id = bu.dept_id
where 1=1
and bu.is_deleted = 0
+ and bu.status = 1
<if test="type==1">
and dept_category=1
</if>
@@ -308,7 +309,7 @@
</select>
- <!--懒加载获取部门树形结构(包含用户数据)-->
+ <!--懒加载获取部门树形结构(包含用户数据),未删除，在职-->
<select id="lazyTreeUsers" resultType="org.springblade.modules.system.node.TreeNodes" >
select DISTINCT
*
@@ -357,10 +358,16 @@
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.is_deleted = 0
+ and bu.status = 1
<if test="type==1">
and dept_category=1
+ and role_alias = '保安'
</if>
<if test="type==2 or type==3">
and dept_category=2
--
Gitblit v1.9.3