From 61e8c756cc2a9e503d643672f103c3837fadc1d4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 31 Aug 2021 21:27:28 +0800
Subject: [PATCH] 保安员，保安公司查询修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 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..af6b05a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -104,6 +104,7 @@
<select id="securityLazyTree" resultMap="treeNodeResultMap" >
SELECT
+ DISTINCT
dept.id,
dept.parent_id,
dept.dept_name AS title,
@@ -124,12 +125,14 @@
on
si.departmentid = dept.id
WHERE
- dept.parent_id = #{param2} AND dept.is_deleted = 0
+ 1=1
and dept_category = 1
- <if test="param1!=null and param1!=''">
+ AND dept.is_deleted = 0
+ and dept.id !=1420222961377357825
+ and dept.parent_id!=1420222961377357825
+ <if test="param1!=null and param1!='' and param1!='1123598813738675201'">
and si.jurisdiction = #{param1}
</if>
- ORDER BY dept.sort
</select>
<!--懒加载获取部门树形结构(按分类查询)-->
@@ -223,6 +226,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>
@@ -307,7 +311,7 @@
</select>
- <!--懒加载获取部门树形结构(包含用户数据)-->
+ <!--懒加载获取部门树形结构(包含用户数据),未删除，在职-->
<select id="lazyTreeUsers" resultType="org.springblade.modules.system.node.TreeNodes" >
select DISTINCT
*
@@ -356,10 +360,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