From 891e0b41fd9a94e3aed1ae8fa23a0a2b63610551 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 15 Sep 2025 16:01:21 +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   | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 deletions(-)

diff --git a/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml b/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml
index 162f100..3a48689 100644
--- a/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml
+++ b/bonus-admin/src/main/resources/mapper/ArchiveMapper.xml
@@ -92,30 +92,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	<select id="getArchivalCatalogue" 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
+		t1.id,
+		t1.content_name AS contentName,
+		t3.id AS parentId,
+		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
 		FROM
-			da_ky_files_contents
+			da_ky_files_contents t1
+		left join da_ky_files_contents t2 on t1.parent_id = t2.id
+		left join da_ky_files_contents t3 on t2.parent_id = t3.id
 		WHERE
-			del_flag = '1' and parent_id = #{parentId} and level = 4
+		t1.del_flag = '1' and t1.parent_id = #{parentId} and t1.level = 4
 		<if test="contentName != null and contentName != ''">
-			and content_name like concat('%', #{contentName}, '%')
+			and t1.content_name like concat('%', #{contentName}, '%')
 		</if>
-		order by create_time desc
+		order by t1.create_time desc
 	</select>
 	<select id="getArchivalCatalogueById" resultType="com.bonus.web.domain.ArchivalCatalogueDto">
 		SELECT