From a744ef0b593ddd352bb302fd7985d3a6880a4d2d Mon Sep 17 00:00:00 2001
From: gulongcheng <474084054@qq.com>
Date: Fri, 27 Feb 2026 16:45:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:CSV=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DimensionTemplateServiceImpl.java | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java
index 83b0df56..2d8c8a57 100644
--- a/data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java
@@ -360,6 +360,11 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
         }
 
         if(CollectionUtils.isNotEmpty(result)) {
+            // 判断是否存在PHASE类型的节点
+            boolean hasPhaseNode = result.stream()
+                    .flatMap(dto -> dto.getMergeSameNameChildren().stream())
+                    .anyMatch(child -> NodeTypeEnum.PHASE.getValue().equals(child.getRelatedResourceUuidOwnType()));
+            
             // 先按dataType排序（文件夹在前dataType=1，文件在后dataType=2），再按children中的最大创建时间倒序排序
             result.sort((dto1, dto2) -> {
                 // 首先按dataType排序：文件夹(1)在前，文件(2)在后
@@ -369,6 +374,15 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
                     return dataType1.compareTo(dataType2); // 升序：1(文件夹) < 2(文件)
                 }
                 
+                // 如果存在PHASE类型节点，dataType相同时按主键ID正序排序
+                if (hasPhaseNode) {
+                    Long id1 = dto1.getId();
+                    Long id2 = dto2.getId();
+                    if (id1 != null && id2 != null && !id1.equals(id2)) {
+                        return id1.compareTo(id2); // 正序排序
+                    }
+                }
+                
                 // dataType相同或都为null时，按创建时间倒序排序
                 LocalDateTime maxCreateTime1 = dto1.getMergeSameNameChildren().stream()
                         .map(FileMetadataInfoResp::getCreateTime)