From 344aa7a7797dbce4e5ef3cbf478cb7ea7f2c2ee4 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 15 Sep 2025 16:08:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=88=86=E7=B1=BB=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/ArchiveMapper.xml   | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml b/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml
index 3a48689..bf48083 100644
--- a/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml
+++ b/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml
@@ -63,32 +63,35 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	<select id="getArchivalCatalogueTree" resultType="com.bonus.web.domain.ArchivalCatalogueDto">
 		SELECT
-			id,
-			content_name AS contentName,
-			parent_id AS parentId,
-			`level` AS level,
-			sort,
-			mark_code AS markCode,
-			term,
-			unit_name AS unitName,
-			major,
-			classify_mark AS classifyMark,
-			create_time AS createTime,
-			update_time AS updateTime,
-			create_user_id AS createUserId,
-			create_user_name AS createUserName,
-			update_user_id AS updateUserId,
-			update_user_name AS updateUserName,
-			del_flag AS delFlag
+		t1.id,
+		t1.content_name AS contentName,
+		t1.parent_id AS parentId,
+		t2.content_name AS parentName,
+		t1.`level` AS LEVEL,
+		t1.sort,
+		t1.mark_code AS markCode,
+		t1.term,
+		t1.unit_name AS unitName,
+		t1.major,
+		t1.classify_mark AS classifyMark,
+		t1.create_time AS createTime,
+		t1.update_time AS updateTime,
+		t1.create_user_id AS createUserId,
+		t1.create_user_name AS createUserName,
+		t1.update_user_id AS updateUserId,
+		t1.update_user_name AS updateUserName,
+		t1.del_flag AS delFlag
 		FROM
-			da_ky_files_contents
+		da_ky_files_contents t1
+		LEFT JOIN da_ky_files_contents t2 ON t1.parent_id = t2.id
 		WHERE
-			del_flag = '1' and level in (0,1,2,3)
+		t1.del_flag = '1'
+		AND t1.LEVEL IN ( 0, 1, 2, 3 )
 		<if test="contentName != null and contentName != ''">
 			and content_name like concat('%', #{contentName}, '%')
 		</if>
 		ORDER BY
-			`level`, sort
+		t1.`level`,t1.sort
 	</select>
 	<select id="getArchivalCatalogue" resultType="com.bonus.web.domain.ArchivalCatalogueDto">
 		SELECT