From 417c4a4ebef70bbcad064d284233d2b5fa71ebef Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 14 Jun 2024 17:36:12 +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 |   22 ++++++++++++++++++++++
 1 files changed, 22 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 24ae04f..295e868 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
@@ -76,6 +76,18 @@
         ORDER BY sort
     </select>
 
+    <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>
+        ORDER BY sort
+    </select>
+
     <select id="lazyTree" resultMap="treeNodeResultMap" >
         SELECT
             dept.id,
@@ -190,5 +202,15 @@
             and bu.dept_id like concat(concat('%',#{treeNode.id}),'%')
         </if>
     </select>
+    <select id="getResDept" resultType="java.lang.String">
+
+        SELECT WM_CONCAT(res_guid)
+        FROM blade_dept where res_guid is not null and res_guid != ''
+        and id in
+        <foreach collection="deptIds.split(',')" item="item" index="index" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+
+    </select>
 
 </mapper>

--
Gitblit v1.9.3