From 0962c742a419d1d6c8acf7c6f4bb12ab7693db6e Mon Sep 17 00:00:00 2001
From: zhuxinru <zhuxinru@honeycombis.com>
Date: Thu, 26 Feb 2026 20:20:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=85=B3=E9=94=AE=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=BD=92=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectServiceImpl.java      | 23 +++++++++----------
 .../impl/SimulationRunServiceImpl.java        |  5 +++-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
index 6f4e2206..9991152c 100644
--- a/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
@@ -2572,12 +2572,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
                 return response;
             } else {
                 ProjectTreeTagReq getTaskTreeReq = ProjectTreeTagReq.buildForProjectAndPhase(req.getProjectNodeId(), req.getPhaseNodeId());
-                // 构建tagMap，从数据字典查
-                Map<String, String> TagMap = tagMapService.getTagMapName();
-                List<TaskNodeTag> tagList = TagMap.entrySet().stream()
-                        .map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue()))
-                        .toList();
-                getTaskTreeReq.setTagMap(tagList);
+                setTagMap(getTaskTreeReq);
                 SdmResponse treeRespond = getTaskTree(getTaskTreeReq);
                 if (treeRespond.getData() != null) {
                     String viewContents = JSONObject.toJSONString(treeRespond.getData());
@@ -2609,12 +2604,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
                 return response;
             } else {
                 ProjectTreeTagReq getTaskTreeReq = ProjectTreeTagReq.buildForProjectAndPhase(req.getProjectNodeId(), req.getPhaseNodeId());
-                // 构建tagMap，从数据字典查
-                Map<String, String> TagMap = tagMapService.getTagMapName();
-                List<TaskNodeTag> tagList = TagMap.entrySet().stream()
-                        .map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue()))
-                        .toList();
-                getTaskTreeReq.setTagMap(tagList);
+                setTagMap(getTaskTreeReq);
                 SdmResponse treeRespond = getTaskTree(getTaskTreeReq);
                 if (treeRespond.getData() != null) {
                     String viewContents = JSONObject.toJSONString(treeRespond.getData());
@@ -2634,6 +2624,15 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
         return SdmResponse.success();
     }
 
+    private void setTagMap(ProjectTreeTagReq getTaskTreeReq) {
+        // 构建tagMap，从数据字典查
+        Map<String, String> TagMap = tagMapService.getTagMapName();
+        List<TaskNodeTag> tagList = TagMap.entrySet().stream()
+                .map(entry -> new TaskNodeTag(entry.getKey(), entry.getValue()))
+                .toList();
+        getTaskTreeReq.setTagMap(tagList);
+    }
+
     private void addNewVersion(String projectId, String phaseId, String version, String viewContents, Long userId) {
         SimulationDesignVersions designVersions = new SimulationDesignVersions();
         designVersions.setProjectId(projectId);
diff --git a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
index 49bf5c68..357f9183 100644
--- a/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/SimulationRunServiceImpl.java
@@ -1648,6 +1648,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public SdmResponse editReport(EditReportReq req) {
         Long userId = ThreadLocalContext.getUserId();
         log.info("编辑报告参数为：{}", req);
@@ -1975,6 +1976,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void editReportAndDownload(EditReportReq req, HttpServletResponse response) {
         Long userId = ThreadLocalContext.getUserId();
         log.info("编辑报告参数为：{}", req);
@@ -2619,6 +2621,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public SdmResponse syncKeyResultToTask(KeyResultReq req) {
         SimulationRun simulationRun = this.lambdaQuery().eq(SimulationRun::getUuid, req.getRunId()).one();
         if (simulationRun == null) {
@@ -2672,8 +2675,8 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
                         simulationRunKeyResult.setFileId(response.getData());
                         taskKeyResultList.add(simulationRunKeyResult);
                     }
-                    simulationKeyResultService.saveBatch(taskKeyResultList);
                 }
+                simulationKeyResultService.saveBatch(taskKeyResultList);
             } else {
                 // 将算例下的指标分析值同步到任务指标
                 List<SimulationPerformance> runPerformanceList = simulationPerformanceService.lambdaQuery()