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

数据总览修正学科信息

Browse Source
This commit is contained in:
gulongcheng
2026-01-19 19:51:06 +08:00
parent 1987ae7003
commit e19a491f23
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
data/src/main/java/com/sdm/data/service/impl/DimensionTemplateServiceImpl.java
View File

@@ -327,13 +327,15 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
String totalName = objectKey.substring(baseDirPath.length());
childDto.setTotalName(totalName);
}
if(ObjectUtils.isNotEmpty(childDto.getOwntaskId()) &&
ObjectUtils.isEmpty(childDto.getOwnDisciplineName())){
// 目前已经移除了学科节点，学科信息作为task节点的字段附属信息
if(ObjectUtils.isNotEmpty(dto.getOwntaskId()) ||
(NodeTypeEnum.TASK.getValue().equalsIgnoreCase(dto.getRelatedResourceUuidOwnType())&&ObjectUtils.isNotEmpty(dto.getRelatedResourceUuid()))){
GetTaskDetailReq getTaskDetailReq = new GetTaskDetailReq();
getTaskDetailReq.setRelatedResourceUuid(childDto.getOwntaskId());
getTaskDetailReq.setRelatedResourceUuid(ObjectUtils.isNotEmpty(dto.getOwntaskId()) ? dto.getOwntaskId() : dto.getRelatedResourceUuid());
SdmResponse<SpdmTaskVo> taskDetail = simulationTaskFeignClient.getTaskDetail(getTaskDetailReq);
if(taskDetail.isSuccess()){
childDto.setOwnDisciplineName(taskDetail.getData().getDisciplineName());
dto.setOwnDisciplineName(taskDetail.getData().getDisciplineName());
}
}
childDto.setPermissionValue(fileUserPermissionService.getMergedPermission(fileInfo.getId(), ThreadLocalContext.getUserId()));
@@ -344,7 +346,6 @@ public class DimensionTemplateServiceImpl extends ServiceImpl<DimensionTemplateM
if(ObjectUtils.isNotEmpty(dto.getOwntaskId()) ||
(NodeTypeEnum.TASK.getValue().equalsIgnoreCase(dto.getRelatedResourceUuidOwnType())&&ObjectUtils.isNotEmpty(dto.getRelatedResourceUuid()))){
GetTaskDetailReq getTaskDetailReq = new GetTaskDetailReq();
// setRelatedResourceUuid 取 dto.getOwntaskId() 或者 dto.getRelatedResourceUuid() 看哪个不为空，不为空的作为参数
getTaskDetailReq.setRelatedResourceUuid(ObjectUtils.isNotEmpty(dto.getOwntaskId()) ? dto.getOwntaskId() : dto.getRelatedResourceUuid());
SdmResponse<SpdmTaskVo> taskDetail = simulationTaskFeignClient.getTaskDetail(getTaskDetailReq);
if(taskDetail.isSuccess()){