From ddb9b1a011b26fec839618fe908dd7d1bacf4a9b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 22 Oct 2021 20:02:36 +0800
Subject: [PATCH] 1.保安单位树接口修改 2.现场保安员，单位检查字段修改，接口修改 3.缴费记录接口修改 4.出资人，管理人员字段调整，接口修改，导出新增示例 5.考试中题目返回去除答案
---
src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 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 0278850..2f1b47f 100644
--- a/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/DeptMapper.xml
@@ -117,7 +117,11 @@
blade_dept
where is_deleted = 0
and
- (id = 1413470343230877697 or id = 1425366663452196865 or id = 1418458374477549569 or id = 1420222768149966850)
+ (id = 1413470343230877697
+ or id = 1425366663452196865
+ or id = 1418458374477549569
+ or id = 1420222768149966850
+ or id = 1426354978959691778)
)
union
(
@@ -142,17 +146,16 @@
sys_information si
on
si.departmentid = dept.id
+ left join
+ sys_jurisdiction sj
+ on
+ sj.id = si.jurisdiction
WHERE
1=1
and si.stats != 4
AND dept.is_deleted = 0
- and dept.id !=1420222961377357825
- and dept.parent_id!=1420222961377357825
- 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 test="jurisdiction!=null and jurisdiction!='' and jurisdiction!='1372091709474910209'">
+ and (sj.id = #{jurisdiction} or sj.parent_id = #{jurisdiction})
</if>
)
</select>
--
Gitblit v1.9.3