暂停BUG

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

@@ -1699,18 +1699,19 @@ public class ApiFlowServiceImpl implements ApiFlowService {
                 return;
             }
             RunRecording mainRunRecording = runRecordList.stream().filter(runRecording -> flowName.equals(runRecording.getFlowName())).findFirst().orElse(null);
-            Integer stopCount = 0;
+            Integer stopCount;
             if (mainRunRecording != null) {
                 stopCount = mainRunRecording.getStopCount();
-            }
                 stopCount = stopCount - 1;
-            if (stopCount != null && stopCount > 0 && "1".equals(stopFlowParam.getAllStartFlow())) {
+                if (stopCount > 0 && "1".equals(stopFlowParam.getAllStartFlow())) {
                     mainRunRecording.setStopCount(stopCount);
                     runRecordingMapper.updateRunRecordingById(mainRunRecording);
                 } else {
                     runRecordingMapper.startByRunIdAndFlowId(runId, mainRunRecording.getFlowId());
                     jobTaskMapper.startByRunIdAndFlowId(runId, mainRunRecording.getFlowId());
                 }
+            }
+
 
         }
     }

byit-myth-core/myth-admin-core/src/main/java/com/byit/task/ScriptExecutorJobTask.java

@@ -100,6 +100,8 @@ public class ScriptExecutorJobTask implements TimerTask {
             if (ScheduleTypeEnum.NORMAL.getCode().equals(mythJobTaskSchedule.getScheduleType())
                 || ScheduleTypeEnum.REAL.getCode().equals(mythJobTaskSchedule.getScheduleType())) {
                 privateParam = PlaceholderUtils.formatBizDateParam(privateParam, PlaceholderEnum.DATE_PLACEHOLDER.getName(), 1);
+
+                if(StringUtils.isNoneBlank(privateParam)) {
                     ScriptParamAndPlaceholderDto scriptParamAndPlaceholderDto = JSON.parseObject(privateParam,ScriptParamAndPlaceholderDto.class);
                     Map<String, String> placeholder = scriptParamAndPlaceholderDto.getPlaceholder();
                     if(CollectionUtil.isNotEmpty(placeholder)) {
@@ -113,6 +115,8 @@ public class ScriptExecutorJobTask implements TimerTask {
                     runParamWrapped.setPrivateParam(privateParam);
                     mythJobTaskSchedule.setRunParam(JSON.toJSONString(runParamWrapped));
                 }
+
+            }
             //获取到公有参数
             Map<String,String> publicParam = runParamWrapped.getPublicParamMap();
             //将私有参数转换为对应的参数DTO

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

@@ -177,7 +177,7 @@
     <include refid="Base_Column_List" />
     from run_recording
     where run_id = #{runId,jdbcType=VARCHAR}
-        and flow_status = '3' and schedule_type != 4
+        and  schedule_type != 4
   </select>
 
   <select id="findUnFinishByRunId" resultMap="BaseResultMap">