From 08a962d2925baa255207fdf979e6fee794f1773b Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Fri, 19 Jul 2024 12:25:19 +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 | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 295e868..182a709 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
@@ -78,12 +78,16 @@
<select id="treeByParentId" resultMap="treeNodeResultMap">
select id, parent_id, dept_name as title, id as "value", id as "key" from blade_dept where is_deleted = 0
- <if test="_parameter!=null and _parameter!=''">
- and (
- id = #{_parameter} or parent_id = #{_parameter} or parent_id in (
- select b.id from blade_dept b where b.is_deleted = 0 and b.PARENT_ID = #{_parameter}
+ <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>
@@ -106,7 +110,10 @@
FROM
blade_dept dept
WHERE
- dept.parent_id = #{param2} AND dept.is_deleted = 0
+ <foreach item="id" collection="param2" open="(" separator="or" close=")">
+ dept.parent_id = #{id}
+ </foreach>
+ AND dept.is_deleted = 0
<if test="param1!=null and param1!=''">
and dept.tenant_id = #{param1}
</if>
--
Gitblit v1.9.3