From 952ae4f9b6e37876965cdc914c0c20544739f290 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 4 May 2023 16:10:47 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E6=9F=A5=E8=AF=A2=E7=BC=BA?=
 =?UTF-8?q?=E5=B0=91=E6=9C=AC=E9=83=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/user/mapper/mapping/DeptMapper.xml   | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 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 0629977c3..1f2459140 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
@@ -116,13 +116,16 @@
     </update>
 
     <select id="getDeptDescendantIndexes" resultType="DeptDTO">
+        SELECT
+        *
+        FROM
+        (
         SELECT
         T3.id,
         T3.pid,
         T3.pids,
         T3.NAME,
         T3.CODE,
-        T5.id,
         T3.type,
         T5.NAME area,
         T3.Remark,
@@ -138,7 +141,27 @@
         </foreach>
         AND t3.area = t5.id
         AND t3.State = 1
-        Order by T3.sort asc
+        UNION
+        SELECT
+        T3.id,
+        T3.pid,
+        T3.pids,
+        T3.NAME,
+        T3.CODE,
+        T3.type,
+        T5.NAME area,
+        T3.Remark,
+        T3.sort
+        FROM
+        sys_dept T3,
+        sys_area T5
+        WHERE
+        T3.area = T5.id
+        AND T3.id = #{id}
+        AND T3.State = 1
+        ) T3
+        ORDER BY
+        T3.sort ASC;
     </select>