From 0b4084a4f290e311abe5d694fb6ff10ea8e4df9a Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 28 Aug 2021 10:58:57 +0800
Subject: [PATCH] 工作汇报数据推送修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 f6642a1..53ed1e6 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -124,8 +124,9 @@
on
si.departmentid = dept.id
WHERE
- dept.parent_id = #{param2} AND dept.is_deleted = 0
- and dept_category = 1
+ 1=1
+ and (stats = 1 or stats =2 or stats =4)
+ AND dept.is_deleted = 0
<if test="param1!=null and param1!=''">
and si.jurisdiction = #{param1}
</if>
@@ -307,7 +308,7 @@
</select>
- <!--懒加载获取部门树形结构(包含用户数据)-->
+ <!--懒加载获取部门树形结构(包含用户数据),未删除，在职-->
<select id="lazyTreeUsers" resultType="org.springblade.modules.system.node.TreeNodes" >
select DISTINCT
*
@@ -356,10 +357,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 = '保安' or role_alias = '未持证保安')
</if>
<if test="type==2 or type==3">
and dept_category=2
--
Gitblit v1.9.3