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 59bedca9..046bd9b5 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 @@ -2701,6 +2701,7 @@ public class NodeServiceImpl extends ServiceImpl simulationTasks = simulationTaskService.lambdaQuery() .eq(SimulationTask::getTenantId, ThreadLocalContext.getTenantId()) .isNotNull(SimulationTask::getDiscipline) + .ne(SimulationTask::getDiscipline, "") .isNotNull(SimulationTask::getExeStatus) .eq(ObjectUtils.isNotEmpty(req.getTag1()), SimulationTask::getTag1, req.getTag1()) .eq(ObjectUtils.isNotEmpty(req.getTag2()), SimulationTask::getTag2, req.getTag2()) diff --git a/project/src/main/resources/mapper/SimulationNodeMapper.xml b/project/src/main/resources/mapper/SimulationNodeMapper.xml index f102b047..644543e7 100644 --- a/project/src/main/resources/mapper/SimulationNodeMapper.xml +++ b/project/src/main/resources/mapper/SimulationNodeMapper.xml @@ -671,6 +671,7 @@ performance.completeStatus is not null and task.discipline is not null + and task.discipline != '' and task.tenant_Id = #{req.tenantId} and task.tag1 = #{req.tag1}