From b672cafe6a447c9b19691b583df9542ad84bce2c Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 26 Nov 2024 16:02:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml
index 182a709..405a0b7 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml
@@ -91,7 +91,22 @@
</if>
ORDER BY sort
</select>
+ <select id="treeByParentIdNew" resultMap="treeNodeResultMap">
+ select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0 and precinct=#{precinct}
+ <if test="parentIds!=null and parentIds!=''">
+ and
+ <foreach item="id" collection="parentIds" open="(" separator="or" close=")">
+ id = #{id} or parent_id = #{id} or parent_id in (
+ select b.id from blade_dept b where b.is_deleted = 0 and b.PARENT_ID = #{id}
+ )
+
+ </foreach>
+
+ </if>
+
+ ORDER BY sort
+ </select>
<select id="lazyTree" resultMap="treeNodeResultMap" >
SELECT
dept.id,
--
Gitblit v1.9.3