修正查询工作流状态SQLBUG

byit-myth-admin/src/main/java/com/byit/service/impl/ApiFlowStatusServiceImpl.java

@@ -64,26 +64,27 @@ public class ApiFlowStatusServiceImpl implements ApiFlowStatusService {
                 }).collect(Collectors.toList());
                 flowStatusCoreDto.setFlowEntityCoreDtos(flowEntityCoreDtos);
                 //查询对应条件的实例
-                List<RunRecording> byFlowNameAndTypeAndWId = runRecordingMapper.findByFlowNameAndTypeAndWId(flowStatusCoreDto);
 
-                if(CollectionUtil.isNotEmpty(byFlowNameAndTypeAndWId)) {
-                    //筛选当天数据
-                    List<RunRecording> collect = byFlowNameAndTypeAndWId.stream().filter(byFlowName -> byFlowName.getTriggerTime() > DateUtil.getThisDayStartDate().getTime() && byFlowName.getTriggerTime() <= DateUtil.getThisDayEndDate().getTime()).collect(Collectors.toList());
-                    if(CollectionUtil.isNotEmpty(collect)) {
-                        collect.forEach(byFlowNameAndType ->{
-                            JobStatusResultDto jobStatusResultDto = new JobStatusResultDto();
-                            jobStatusResultDto.setFindDateTime(System.currentTimeMillis());
-                            jobStatusResultDto.setEndTime(byFlowNameAndType.getEndTime().getTime());
-                            jobStatusResultDto.setJobName(byFlowNameAndType.getFlowName());
-                            jobStatusResultDto.setRunIng("4".equals(byFlowNameAndType.getFlowStatus()));
-                            jobStatusResultDto.setStartDateTime(byFlowNameAndType.getStartTime().getTime());
-                            jobStatusResultDtos.add(jobStatusResultDto);
-                        });
+                if(flowStatusCoreDto != null) {
+                    List<RunRecording> byFlowNameAndTypeAndWId = runRecordingMapper.findByFlowNameAndTypeAndWId(flowStatusCoreDto);
+
+                    if(CollectionUtil.isNotEmpty(byFlowNameAndTypeAndWId)) {
+                        //筛选当天数据
+                        List<RunRecording> collect = byFlowNameAndTypeAndWId.stream().filter(byFlowName -> byFlowName.getTriggerTime() > DateUtil.getThisDayStartDate().getTime() && byFlowName.getTriggerTime() <= DateUtil.getThisDayEndDate().getTime()).collect(Collectors.toList());
+                        if(CollectionUtil.isNotEmpty(collect)) {
+                            collect.forEach(byFlowNameAndType ->{
+                                JobStatusResultDto jobStatusResultDto = new JobStatusResultDto();
+                                jobStatusResultDto.setFindDateTime(System.currentTimeMillis());
+                                jobStatusResultDto.setEndTime(byFlowNameAndType.getEndTime().getTime());
+                                jobStatusResultDto.setJobName(byFlowNameAndType.getFlowName());
+                                jobStatusResultDto.setRunIng("4".equals(byFlowNameAndType.getFlowStatus()));
+                                jobStatusResultDto.setStartDateTime(byFlowNameAndType.getStartTime().getTime());
+                                jobStatusResultDtos.add(jobStatusResultDto);
+                            });
+                        }
                     }
                 }
-
             }
-
         });
         return jobStatusResultDtos;
     }

byit-myth-core/myth-admin-core/src/main/resources/mapper/RunRecordingMapper.xml

@@ -208,14 +208,14 @@
     select
         <include refid="Base_Column_List" />
     from run_recording
-        <if test="flowStatusCoreDtos != null">
-            (
-              <foreach collection="flowStatusCoreDtos.flowEntityCoreDtos" item="flowEntityCoreDto" separator=" or " open="(" close=")">
-                flow_name = #{flowEntityCoreDto.flowName} and schedule_type = #{flowEntityCoreDto.scheduleType}
-              </foreach>
-            )
+        <where>
+          <if test="flowStatusCoreDtos != null">
+            <foreach collection="flowStatusCoreDtos.flowEntityCoreDtos" item="flowEntityCoreDto" separator=" or " open="(" close=")">
+              flow_name = #{flowEntityCoreDto.flowName} and schedule_type = #{flowEntityCoreDto.scheduleType}
+            </foreach>
             and workspace_id = #{flowStatusCoreDtos.workspaceId}
-        </if>
+          </if>
+        </where>
   </select>
 
   <select id="findByRunIdAndFlowName" resultMap="BaseResultMap">