From b43a826fadc246cffb0669cd4335f720d3f29cdb Mon Sep 17 00:00:00 2001
From: gulongcheng <474084054@qq.com>
Date: Tue, 31 Mar 2026 16:39:04 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=95=B0=E6=8D=AE=E6=80=BB?=
 =?UTF-8?q?=E8=A7=88=EF=BC=8C=E7=A9=BA=E6=96=87=E4=BB=B6=E5=A4=B9=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/FileMetadataInfoMapper.xml    | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/data/src/main/resources/mapper/FileMetadataInfoMapper.xml b/data/src/main/resources/mapper/FileMetadataInfoMapper.xml
index e11c43a4..8e670037 100644
--- a/data/src/main/resources/mapper/FileMetadataInfoMapper.xml
+++ b/data/src/main/resources/mapper/FileMetadataInfoMapper.xml
@@ -25,8 +25,10 @@
 
 
     <select id="listSimulationNodeFiles" resultType="com.sdm.data.model.entity.FileMetadataInfo">
+        SELECT DISTINCT tmp.*
+        FROM (
         <!-- 第一个子查询：文件（必执行） -->
-        SELECT distinct file_metadata_info.*
+        SELECT file_metadata_info.*
         FROM file_metadata_info
         <where>
             <if test="parentIds != null and parentIds.size() > 0">
@@ -36,7 +38,7 @@
                 </foreach>
                 )
             </if>
-            and tenantId = #{tenantId}
+            AND tenantId = #{tenantId}
             AND dataType = 2
             AND isLatest = true
             AND deletedAt IS NULL
@@ -45,7 +47,6 @@
         <!-- 动态判断：uuids 不为空且有元素时，才拼接 UNION ALL + 第二个子查询：普通文件夹和节点文件夹 -->
         <if test="fileIds != null and fileIds.size() > 0">
             UNION ALL
-            (
             SELECT file_metadata_info.*
             FROM file_metadata_info
             <if test="filterEmptyData != null and filterEmptyData">
@@ -53,8 +54,7 @@
             </if>
             <where>
                 file_metadata_info.tenantId = #{tenantId}
-                and
-                file_metadata_info.id IN (
+                AND file_metadata_info.id IN (
                 <foreach collection="fileIds" item="fileId" separator=",">
                     #{fileId}
                 </foreach>
@@ -65,10 +65,8 @@
                     AND file_storage.fileId IS NOT NULL
                 </if>
             </where>
-            )
         </if>
-
-        <!-- 排序：无论是否联合，都对最终结果排序 -->
+        ) tmp
         ORDER BY dataType ASC, updateTime DESC
     </select>
 </mapper>
\ No newline at end of file