From 5d75ce7908a1e942e212365450542efd41b57ef0 Mon Sep 17 00:00:00 2001
From: zhuxinru <zhuxinru@honeycombis.com>
Date: Thu, 12 Mar 2026 16:19:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=88=9B=E5=BB=BA=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9tagReq=E4=BC=A0=E5=85=A5taskId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/service/impl/MinioFileIDataFileServiceImpl.java | 5 +++++
 .../com/sdm/project/service/impl/DemandServiceImpl.java  | 1 +
 .../com/sdm/project/service/impl/NodeServiceImpl.java    | 1 +
 .../com/sdm/project/service/impl/ProjectServiceImpl.java | 3 +++
 .../project/service/impl/SimulationRunServiceImpl.java   | 1 +
 .../com/sdm/project/service/impl/TaskServiceImpl.java    | 9 +++++++++
 6 files changed, 20 insertions(+)

diff --git a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
index 33652a75..3b0fd569 100644
--- a/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
+++ b/data/src/main/java/com/sdm/data/service/impl/MinioFileIDataFileServiceImpl.java
@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.github.pagehelper.util.StringUtil;
 import com.google.common.collect.Sets;
 import com.sdm.common.common.SdmResponse;
 import com.sdm.common.common.ThreadLocalContext;
@@ -463,6 +464,10 @@ public class MinioFileIDataFileServiceImpl implements IDataFileService {
             dirInfo.setTag9(tagReq.getTag9());
             dirInfo.setTag10(tagReq.getTag10());
             dirInfo.setTaskId(tagReq.getTaskId());
+            // 兜底 如果文件夹ownType是task 但是tag没传taskId 设置下taskId为relatedResourceUuid
+            if (StringUtil.isEmpty(tagReq.getTaskId()) && NodeTypeEnum.TASK.getValue().equals(uuIdOwnType)) {
+                dirInfo.setTaskId(uuid);
+            }
             dirInfo.setRunId(tagReq.getRunId());
         }
         return dirInfo;
diff --git a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
index 27f2ba88..34378ccf 100644
--- a/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/DemandServiceImpl.java
@@ -1701,6 +1701,7 @@ public class DemandServiceImpl extends BaseService implements IDemandService {
         createDirReq.setDirName(dirName);
         TagReq tagReq = new TagReq();
         BeanUtils.copyProperties(taskNode,tagReq);
+        tagReq.setTaskId(taskNode.getUuid());
         createDirReq.setTagReq(tagReq);
         log.info("下发任务调用创建文件夹的参数为：{}", createDirReq);
         SdmResponse response = dataClientFeignClient.createDir(createDirReq);
diff --git a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
index f941119a..46729fb2 100644
--- a/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java
@@ -1758,6 +1758,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
         createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
         TagReq tagReq = new TagReq();
         BeanUtils.copyProperties(taskNode,tagReq);
+        tagReq.setTaskId(uuid);
         createDirReq.setTagReq(tagReq);
         log.info("创建任务时，调用创建文件夹的参数为：{}", createDirReq);
         SdmResponse response = dataClientFeignClient.createDir(createDirReq);
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 cdfb1cdc..d097bf3d 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
@@ -2573,6 +2573,9 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
         createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
         TagReq tagReq = new TagReq();
         BeanUtils.copyProperties(taskNode,tagReq);
+        if (NodeTypeEnum.TASK.getValue().equals(uuidOwnType)) {
+            tagReq.setTaskId(uuid);
+        }
         createDirReq.setTagReq(tagReq);
         log.info("创建项目阶段时，调用创建文件夹的参数为：{}", createDirReq);
         SdmResponse response = dataClientFeignClient.createDir(createDirReq);
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 6ad81817..c4f3d18a 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
@@ -754,6 +754,7 @@ public class SimulationRunServiceImpl extends ServiceImpl<SimulationRunMapper, S
                         runPerformance.setRunId(simulationRun.getUuid());
                         runPerformance.setUuid(RandomUtil.generateString(32));
                         runPerformance.setCompleteStatus(PerformanceStatusEnum.UNANALYZED.getCode());
+                        runPerformance.setResultValue(null);
                         runPerformance.setCreator(userId);
                         runPerformance.setCreateTime(null);
                         runPerformanceList.add(runPerformance);
diff --git a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
index f989b883..03ddbb5b 100644
--- a/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
+++ b/project/src/main/java/com/sdm/project/service/impl/TaskServiceImpl.java
@@ -2565,6 +2565,9 @@ public class TaskServiceImpl implements ITaskService {
         createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
         TagReq tagReq = new TagReq();
         BeanUtils.copyProperties(spdmProjectNodeEditReq,tagReq);
+        if (NodeTypeEnum.TASK.getValue().equals(uuidOwnType)) {
+            tagReq.setTaskId(uuid);
+        }
         createDirReq.setTagReq(tagReq);
         log.info("同步CID任务调用创建文件夹的参数为：{}", createDirReq);
         SdmResponse response = dataClientFeignClient.createDir(createDirReq);
@@ -2581,6 +2584,9 @@ public class TaskServiceImpl implements ITaskService {
         createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
         TagReq tagReq = new TagReq();
         BeanUtils.copyProperties(taskNode,tagReq);
+        if (NodeTypeEnum.TASK.getValue().equals(uuidOwnType)) {
+            tagReq.setTaskId(uuid);
+        }
         createDirReq.setTagReq(tagReq);
         log.info("同步CID任务调用创建文件夹的参数为：{}", createDirReq);
         SdmResponse response = dataClientFeignClient.createDir(createDirReq);
@@ -2597,6 +2603,9 @@ public class TaskServiceImpl implements ITaskService {
         createDirReq.setDirType(DirTypeEnum.PROJECT_NODE_DIR.getValue());
         TagReq tagReq = new TagReq();
         BeanUtils.copyProperties(task,tagReq);
+        if (NodeTypeEnum.TASK.getValue().equals(uuidOwnType)) {
+            tagReq.setTaskId(uuid);
+        }
         createDirReq.setTagReq(tagReq);
         log.info("批量修改任务时调用创建文件夹的参数为：{}", createDirReq);
         SdmResponse response = dataClientFeignClient.createDir(createDirReq);