From e105a89e83408e15e4527450362356c3d87234c5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 10 Sep 2021 17:51:18 +0800
Subject: [PATCH] 装备，车辆字段新增
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 25 +++++++++++++++++++++++--
1 files changed, 23 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 342af2b..e4e6fd3 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -103,7 +103,24 @@
ORDER BY dept.sort
</select>
+ <!--查询保安公司列表，保安员管理-->
<select id="securityLazyTree" resultMap="treeNodeResultMap" >
+ (
+ SELECT
+ id,
+ parent_id,
+ dept_name AS title,
+ id AS "value",
+ id AS "key",
+ 0 AS "has_children"
+ FROM
+ blade_dept
+ where is_deleted = 0
+ and
+ (id = 1413470343230877697 or id = 1425366663452196865 or id = 1418458374477549569 or id = 1420222768149966850)
+ )
+ union
+ (
SELECT
DISTINCT
dept.id,
@@ -127,13 +144,17 @@
si.departmentid = dept.id
WHERE
1=1
- and dept_category = 1
+ and si.stats != 4
AND dept.is_deleted = 0
and dept.id !=1420222961377357825
and dept.parent_id!=1420222961377357825
- <if test="param1!=null and param1!='' and param1!='1123598813738675201'">
+ and dept.parent_id!=1425365577303621633
+ and dept.id != 1425365577303621633
+ and dept.id != 1432625856013971457
+ <if test="param1!=null and param1!='' and param1!='1372091709474910209'">
and si.jurisdiction = #{param1}
</if>
+ )
</select>
<!--懒加载获取部门树形结构(按分类查询)-->
--
Gitblit v1.9.3