Merge remote-tracking branch 'origin/main'

project/src/main/java/com/sdm/project/service/impl/NodeServiceImpl.java

@@ -2701,6 +2701,7 @@ public class NodeServiceImpl extends ServiceImpl<SimulationNodeMapper, Simulatio
         List<SimulationTask> 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())

project/src/main/resources/mapper/SimulationNodeMapper.xml

@@ -671,6 +671,7 @@
         <where>
             performance.completeStatus is not null
             and task.discipline is not null
+            and task.discipline != ''
             and task.tenant_Id = #{req.tenantId}
             <if test="req.tag1 != null and req.tag1 !='' ">
                 and task.tag1 = #{req.tag1}