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

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

@@ -48,7 +48,9 @@ public class RunRecordingServiceImpl implements RunRecordingService {
     public boolean findRunRecordingIsRunning(Integer flowId) {
         List<RunRecording> runRecordings = runRecordingMapper.findRunRecordingByFlowId(flowId);
         for (RunRecording runRecording : runRecordings) {
-            if (!RunRecordingEnum.FLOW_STATUS_IS_END.getCode().equals(runRecording.getFlowStatus())) {
+            //判断当前的实例  中是否有 未完成的
+            if (RunRecordingEnum.FLOW_STATUS_RUN_ING.getCode().equals(runRecording.getFlowStatus()) &&
+                    RunRecordingEnum.FLOW_STATUS_IS_STOP.getCode().equals(runRecording.getFlowStatus())) {
                 return true;
             }
         }