toolchaintechnologycenter/spdm-backend
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix[project]: 仿真策划时，调整查询项目拓展属性的位置

Browse Source
This commit is contained in:
lidongyang
2026-03-27 09:07:05 +08:00
parent c11d45fcb0
commit 99dcae4910
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
project/src/main/java/com/sdm/project/service/impl/ProjectServiceImpl.java
View File

@@ -2199,7 +2199,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
log.info("仿真策划时，删除用户权限的返回值为：{}",updatePermissionResponse); log.info("仿真策划时，删除用户权限的返回值为：{}",updatePermissionResponse);
} }
private SdmResponse newRealAddSimulationTaskItems(TaskNodeTree taskNodeTree, Long tenantId, List<TaskNodeTag> tagList, String ownRootNodeUuid,List<SpdmNodeExtraVo> nodeExtraList) { private SdmResponse newRealAddSimulationTaskItems(TaskNodeTree taskNodeTree, Long tenantId, List<TaskNodeTag> tagList, String ownRootNodeUuid) {
Long userId = ThreadLocalContext.getUserId(); Long userId = ThreadLocalContext.getUserId();
SdmResponse response = SdmResponse.success(); SdmResponse response = SdmResponse.success();
if (CollectionUtils.isEmpty(taskNodeTree.getNodeList())) { if (CollectionUtils.isEmpty(taskNodeTree.getNodeList())) {
@@ -2415,6 +2415,12 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
for (TaskNode taskNode : taskNodeList) { for (TaskNode taskNode : taskNodeList) {
updatePermission(userId,taskNode.getUuid(),FilePermissionEnum.READ.getValue()); updatePermission(userId,taskNode.getUuid(),FilePermissionEnum.READ.getValue());
} }
// 查询项目的拓展属性
List<String> tag1Id = taskNodeList.get(0).getTag1();
List<SpdmNodeExtraVo> nodeExtraList = new ArrayList<>();
if (CollectionUtils.isNotEmpty(tag1Id)) {
nodeExtraList = nodeMapper.getNodeExtraListByNodeIdList(tag1Id);
}
// 20260320 新增任务时，同步新增一个需求 // 20260320 新增任务时，同步新增一个需求
try { try {
addDemandByTask(taskNodeList,nodeExtraList); addDemandByTask(taskNodeList,nodeExtraList);
@@ -3067,10 +3073,7 @@ public class ProjectServiceImpl extends BaseService implements IProjectService {
Long tenantId = ThreadLocalContext.getTenantId(); Long tenantId = ThreadLocalContext.getTenantId();
TaskNodeTree taskNodeTree = newParseTaskTree(JSONArray.parseArray(JSONArray.toJSONString(addNodeList))); TaskNodeTree taskNodeTree = newParseTaskTree(JSONArray.parseArray(JSONArray.toJSONString(addNodeList)));
tagMap = req.getTagMap(); tagMap = req.getTagMap();
List<String> tag1Id = addNodeList.get(0).getTag1(); SdmResponse response = newRealAddSimulationTaskItems(taskNodeTree, tenantId, req.getTagMap(),req.getOwnRootNodeUuid());
// 查询项目的拓展属性
List<SpdmNodeExtraVo> nodeExtraList = nodeMapper.getNodeExtraListByNodeIdList(tag1Id);
SdmResponse response = newRealAddSimulationTaskItems(taskNodeTree, tenantId, req.getTagMap(),req.getOwnRootNodeUuid(),nodeExtraList);
if (response.getCode() != ResultCode.SUCCESS.getCode()) { if (response.getCode() != ResultCode.SUCCESS.getCode()) {
log.error("新增任务、分析项失败，清理新增数据！"); log.error("新增任务、分析项失败，清理新增数据！");
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();