From d7483a81e4884106229a8adf345ea22fedeed684 Mon Sep 17 00:00:00 2001
From: gulongcheng <474084054@qq.com>
Date: Thu, 12 Mar 2026 12:01:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=BB=BF=E7=9C=9F?=
 =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=86=B5?=
 =?UTF-8?q?=E5=BA=93=E5=AE=A1=E6=89=B9=E5=B1=95=E7=A4=BA=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sdm/data/service/impl/DataAnalysisServiceImpl.java | 10 ++++++++++
 .../service/impl/FileSimulationMappingServiceImpl.java |  4 ++--
 2 files changed, 12 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 090b5207..497d542e 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
@@ -62,6 +62,9 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
     @Autowired
     private IFileTagRelService fileTagRelService;
 
+    @Autowired
+    IFileDictTagQueryService fileDictTagQueryService;
+
 
     @Override
     public SdmResponse<PageDataResp<List<SimulationTaskResultCurveResp>>> getSimulationTaskFile(GetSimulationTaskFileReq req) {
@@ -123,10 +126,14 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
             if (ObjectUtils.isNotEmpty(file.getFileSize())) {
                 resp.setFormatFileSize(FileSizeUtils.formatFileSize(BigDecimal.valueOf(file.getFileSize())));
             }
+
             hierarchyHelper.setTagReqFromFileMetadata(file, resp);
             return resp;
         }).collect(Collectors.toList());
 
+        // 填充children的文件类型标签信息
+        fileDictTagQueryService.fillFileTagsForRespList(finalResultList, SimulationTaskResultCurveResp::getId);
+
         sortByTagFieldInCurrentPage(finalResultList, req.getOrderBy(), req.getOrderType());
 
         PageInfo<SimulationTaskResultCurveResp> pageInfo = new PageInfo<>(finalResultList);
@@ -407,6 +414,9 @@ public class DataAnalysisServiceImpl implements IDataAnalysisService {
                 setTagReqForSimulationResult(finalResultList, fileIdList);
                 fillFormatFileSizeForTaskLevel(finalResultList, fileIdList);
 
+                // 填充children的文件类型标签信息
+                fileDictTagQueryService.fillFileTagsForRespList(finalResultList, SimulationTaskResultCurveResp::getId);
+
                 sortByTagFieldInCurrentPage(finalResultList, req.getOrderBy(), req.getOrderType());
                 List<SimulationTaskResultCurveResp> sortedList = finalResultList.stream()
                         .sorted(
diff --git a/data/src/main/java/com/sdm/data/service/impl/FileSimulationMappingServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/FileSimulationMappingServiceImpl.java
index 381f50ac..95dcdf50 100644
--- a/data/src/main/java/com/sdm/data/service/impl/FileSimulationMappingServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/FileSimulationMappingServiceImpl.java
@@ -53,11 +53,11 @@ public class FileSimulationMappingServiceImpl extends ServiceImpl<FileSimulation
                 fileSimulationMappings.add(fileSimulationMapping);
             });
             // 先删除原先所有的文件绑定关系
-            this.lambdaUpdate()
+            /*this.lambdaUpdate()
                     .in(FileSimulationMapping::getFileId, fileIds)
                     .in(FileSimulationMapping::getSimulationPoolId, fileSimulationMappingReq.getSimulationPoolId())
                     .in(FileSimulationMapping::getSimulationPoolVersion, fileSimulationMappingReq.getSimulationPoolVersion())
-                    .remove();
+                    .remove();*/
         }
         this.saveBatch(fileSimulationMappings);
         return SdmResponse.success();