From 75ef4de1c55e6029fbd2b37ee3b52665c9135b5f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Dec 2021 15:27:41 +0800
Subject: [PATCH] 1. 派遣查询修改 2. 车辆定位接口修改,会报空指针 3. 日志输出修改管理 4. 证书导出Png图片不显示bug修复

---
 src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 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 ba9ac4c..608fe0a 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -200,6 +200,24 @@
         and dept.id!= 1426355050199945218
         <if test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
             and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
+            union
+                    (
+                    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 = 1420222768149966850
+                    or id = 1426354978959691778)
+                    )
         </if>
     </select>
 

--
Gitblit v1.9.3