From 70510d49fc0381d40642857466fa7165d33027e5 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 14 Sep 2021 11:16:56 +0800
Subject: [PATCH] 荣誉录入新增发证机关字段，保安员查询接口修改，保安公司查询修改
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 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 7044787..1fea3ec 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -395,7 +395,26 @@
<select id="selectId" resultType="java.util.HashMap">
SELECT id FROM blade_dept WHERE parent_id =#{id} and is_deleted = 0
</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,
@@ -419,12 +438,16 @@
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>
</mapper>
--
Gitblit v1.9.3