From c0e0761eec99d3642b6a1acdcdb5e2b51a481aaf Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 11 Dec 2024 20:49:28 +0800
Subject: [PATCH] 权限配置

---
 skjcmanager/skjcmanager-service/skjcmanager-system/src/main/java/cn/gistack/system/mapper/DeptMapper.xml |   34 ++++++++++++++++++++++++++++------
 1 files changed, 28 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..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
@@ -78,16 +78,35 @@
 
     <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>
+    <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,
@@ -106,7 +125,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