From f039e6e4841259393ca6a56eccdd39eb4b03f7b1 Mon Sep 17 00:00:00 2001 From: zhuxinru Date: Thu, 12 Feb 2026 11:06:07 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=8A=A5=E5=91=8A=E5=BD=92=E6=A1=A3?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E6=8C=89tag1=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataAnalysisServiceImpl.java | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java index 2089792d..9c3c5726 100644 --- a/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java +++ b/data/src/main/java/com/sdm/data/service/impl/DataAnalysisServiceImpl.java @@ -140,10 +140,22 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService { .eq(FileMetadataInfo::getParentId, secondDirId) .eq(FileMetadataInfo::getTenantId, ThreadLocalContext.getTenantId()) .list(); - PageInfo page = new PageInfo<>(fileMetadataInfoList); + List sortedList = fileMetadataInfoList.stream() + .sorted(Comparator.comparing(FileMetadataInfo::getTag1, + Comparator.nullsLast((tag1, tag2) -> { + try { + int num1 = Integer.parseInt(tag1.trim()); + int num2 = Integer.parseInt(tag2.trim()); + return Integer.compare(num1, num2); + } catch (NumberFormatException e) { + return tag1.compareTo(tag2); + } + }))) + .collect(Collectors.toList()); + PageInfo page = new PageInfo<>(sortedList); long total = page.getTotal(); - List fileIdList = fileMetadataInfoList.stream().map(FileMetadataInfo::getId).toList(); + List fileIdList = sortedList.stream().map(FileMetadataInfo::getId).toList(); List finalResultList = hierarchyHelper.processFileHierarchy( fileIdList, SimulationTaskResultCurveResp.class,