Merge remote-tracking branch 'origin/developer' into developer

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

@@ -1161,11 +1161,11 @@ public class ApiFlowServiceImpl implements ApiFlowService {
         ValidationUtil.isTrueValidation(FlowPropertyEnum.IS_INNER.getCode().equals(flow.getIsInner()), "内嵌工作流不允许删除！");
         //判断是否在调度中
         List<RunRecording> recordingList = runRecordingMapper.findOnScheduleByFlowId(flow.getFlowId());
-        ValidationUtil.isTrueValidation(null != recordingList && recordingList.size() > 0 , "工作流已在调度中不允许撤销调度！");
+        ValidationUtil.isTrueValidation(null != recordingList || recordingList.size() > 0 , "工作流已在调度中不允许撤销调度！");
         List<RunRecording> unStartRecordingList = runRecordingMapper.findUnStartByFlowId(flow.getFlowId());
         //删除对应的task记录
         unStartRecordingList.forEach(runRecording -> {
-            ValidationUtil.isTrueValidation((runRecording.getTriggerTime() - System.currentTimeMillis()) > 10000 , "工作流已在调度中不允许删除");
+            ValidationUtil.isTrueValidation((runRecording.getTriggerTime() - System.currentTimeMillis()) < 10000 , "工作流已在调度中不允许删除");
             runRecordingMapper.deleteByRunId(runRecording.getRunId());
             jobTaskMapper.deleteByRunId(runRecording.getRunId());
         });