diff --git a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java index bc308ee1..a2e3827a 100644 --- a/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java +++ b/project/src/main/java/com/sdm/project/service/impl/LyricInternalServiceImpl.java @@ -778,7 +778,7 @@ public class LyricInternalServiceImpl implements ILyricInternalService { if (CollectionUtils.isNotEmpty(createDirItemList)) { // project的uuid,createDirItemList中每一项project的uuid都一样,取第一个即可 for (BatchCreateDirItem batchCreateDirItem : createDirItemList) { - String projectNodeId = createDirItemList.get(0).getParentDirNodeInfo().getUuId(); + String projectNodeId = batchCreateDirItem.getParentDirNodeInfo().getUuId(); if (StringUtils.isBlank(projectNodeId)) { log.error("projectNodeId为空,createDirItemList:{}", createDirItemList); return; @@ -2379,6 +2379,14 @@ public class LyricInternalServiceImpl implements ILyricInternalService { return Collections.emptyList(); } + // 过滤3D负责人为空的待办数据 + todoInfoList = todoInfoList.stream().filter(todo -> StringUtils.isNotBlank(todo.getThreeDimensionalPerformer())) + .collect(Collectors.toList()); + if (CollectionUtils.isEmpty(todoInfoList)) { + log.info("未查询到{}到{}的待同步的有效待办数据", startTime, endTime); + return Collections.emptyList(); + } + List expTodoInfoList = todoInfoList.stream().filter(todoInfo -> DemandTypeEnum.FINITE_ELEMENT_SIMULATION.getName().equals(todoInfo.getRelevanceTask())) .toList(); if (CollectionUtils.isNotEmpty(expTodoInfoList)) {