From a7a6a0c332f268010b4da0161cdee80acf9bc4ce Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 22 四月 2024 15:59:57 +0800
Subject: [PATCH] 2024-4-22 资源要求-人员明细-bug修改

---
 cnas-server/src/main/resources/mapper/DepartmentMapper.xml |   37 +++++++++++++------------------------
 1 files changed, 13 insertions(+), 24 deletions(-)

diff --git a/cnas-server/src/main/resources/mapper/DepartmentMapper.xml b/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
index d29cd93..f0a3326 100644
--- a/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
+++ b/cnas-server/src/main/resources/mapper/DepartmentMapper.xml
@@ -1,21 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yuanchu.mom.mapper.DepartmentMapper">
-    <select id="selectDepartment" resultType="com.yuanchu.mom.pojo.Department">
-        WITH RECURSIVE DepartmentHierarchy AS (
-            SELECT id, name, father_id
-            FROM department
-            WHERE father_id IS NULL
-
-            UNION ALL
-
-            SELECT d.id, d.name, d.father_id
-            FROM department d
-                     JOIN DepartmentHierarchy dh ON d.father_id = dh.id
-        )
+    <select id="selectDepartment" resultType="com.yuanchu.mom.dto.DepartmentDto">
         SELECT id, name, father_id
-        FROM DepartmentHierarchy;
+        FROM department
     </select>
+
     <select id="showUserById" resultType="com.yuanchu.mom.dto.UserDto">
         select * from (select id, name, age, email, phone,depart_id
         from user where state=1 and SUBSTRING_INDEX(depart_id, ',', -1) in
@@ -26,18 +16,17 @@
             ${ew.customSqlSegment}
         </if>
     </select>
+
     <select id="selectSonById" resultType="java.lang.Integer">
-        WITH RECURSIVE DepartmentHierarchy AS (
-            SELECT id, name, father_id
-            FROM department
-            WHERE id = #{id}
-            UNION ALL
-            SELECT d.id, d.name, d.father_id
-            FROM department d
-                     JOIN DepartmentHierarchy dh ON d.father_id = dh.id
-        )
+        SELECT au.id
+        FROM (SELECT * FROM department WHERE father_id IS NOT NULL) au,
+             (SELECT @father_id := #{id}) pd
+        WHERE FIND_IN_SET(father_id, @father_id) > 0
+                  AND @father_id := concat(@father_id, ',', id)
+        UNION
         SELECT id
-        FROM DepartmentHierarchy
-        order by id desc;
+        FROM department
+        WHERE id = #{id}
+        ORDER BY id
     </select>
 </mapper>

--
Gitblit v1.9.3