修改工作流状态

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

@@ -1431,12 +1431,15 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         List<RunRecording> recordingList = runRecordingMapper.findOnScheduleByFlowId(flow.getFlowId());
         ValidationUtil.isTrueValidation(null != recordingList && recordingList.size() > 0 , "工作流已在调度中不允许撤销调度！");
         List<RunRecording> unStartRecordingList = runRecordingMapper.findUnStartByFlowId(flow.getFlowId());
+        if (null != unStartRecordingList && unStartRecordingList.size() > 0){
             //删除对应的task记录
             unStartRecordingList.forEach(runRecording -> {
                 ValidationUtil.isTrueValidation((runRecording.getTriggerTime() - System.currentTimeMillis()) < 10000 , "工作流已在调度中不允许撤销调度");
                 runRecordingMapper.deleteByRunId(runRecording.getRunId());
                 jobTaskMapper.deleteByRunId(runRecording.getRunId());
             });
+        }
+
 
         //撤销工作流调度
         updateFlowStart(flow, false);
@@ -1453,10 +1456,10 @@ public class ApiFlowServiceImpl implements ApiFlowService {
             flow.setStartUp(FlowPropertyEnum.IS_START.getCode());
             //如果是周期调度修改下次执行时间
             if (FlowPropertyEnum.SCHEDULE_MODE.getCode().equals(flow.getExecType())){
+                flow.setTriggerNextTime(new CronExpression(flow.getFlowCron()).getNextValidTimeAfter(new Date()).getTime());
             }
         }else {
             flow.setStartUp(FlowPropertyEnum.NO_START.getCode());
-                flow.setTriggerNextTime(new CronExpression(flow.getFlowCron()).getNextValidTimeAfter(new Date()).getTime());
         }
         flowMapper.updateByIdSelective(flow);
         List<Node> nodeList = nodeMapper.findVirtualByFlowId(flow.getFlowId());