From f292b3101e16462268238a036432fa9f24c6e1c9 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 27 Apr 2023 16:37:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E9=9B=86=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/user/mapper/mapping/DeptMapper.xml   | 28 ++++++-------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml
index 8171b66ab..9cf89c7fd 100644
--- a/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml
+++ b/pqs-user/user-boot/src/main/java/com/njcn/user/mapper/mapping/DeptMapper.xml
@@ -124,33 +124,21 @@
         T3.pid,
         T3.pids,
         T3.NAME,
-        T3.code,
+        T3.CODE,
+        T5.id,
         T3.type,
-        T5.NAME area ,
+        T5.NAME area,
         T3.Remark,
         T3.sort
         FROM
-        (
-        SELECT
-        @codes AS _ids,
-        (
-        SELECT @codes := GROUP_CONCAT( id ) FROM sys_dept WHERE FIND_IN_SET( pid, @codes ) ) AS T1
-        FROM
-        sys_dept s,
-        ( SELECT @codes := #{id} ) T4
-        WHERE
-        @codes IS NOT NULL
-        <if test="type != null">
-            AND s.type in
-            <foreach collection="type" item="item" open="(" close=")" separator=",">
-                #{item}
-            </foreach>
-        </if>
-        ) T2,
         sys_dept T3,
         sys_area T5
         WHERE
-        FIND_IN_SET( T3.id, T2._ids )
+        FIND_IN_SET( #{id}, T3.pids )
+        and t3.type in
+        <foreach collection="type" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
         AND t3.area = t5.id
         AND t3.State = 1
         Order by T3.sort asc