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