修改基于工作流名称暂停工作流BUG

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

@@ -254,7 +254,7 @@
     <include refid="Base_Column_List" />
     from run_recording
     where flow_id = #{flowId}
-        and flow_status != '4' and schedule_type != 4
+        and (flow_status != '4' or flow_status != '1') and schedule_type != 4
   </select>
 
   <select id="findStatusByStartAndEndTime" resultType="com.byit.dto.plugin.StatisticData" useCache="false" flushCache="true">

byit-myth-core/myth-core-common/src/main/java/com/byit/job/utils/PlaceholderUtils.java

@@ -147,40 +147,6 @@ public class PlaceholderUtils {
         }
         return JSON.toJSONString(scriptParamAndPlaceholderDto);
     }
-
-
-    public static void main(String[] args) {
-        /*ScriptParamAndPlaceholderDto sc = new ScriptParamAndPlaceholderDto();
-        Map<String,String> m1 = new HashMap<>(2);
-        Map<String,String> m2 = new HashMap<>(2);
-
-        m1.put(PlaceholderEnum.DATE_PLACEHOLDER.getName(),"2018年12月12日");
-        m1.put("name","狗子");
-        m2.put(PlaceholderEnum.DATE_PLACEHOLDER.getName(),"2010年10月10日");
-        m2.put("age","1000");
-
-
-        sc.setPlaceholder(m2);
-        sc.setParam(m1);
-
-
-        String jsonString = JSON.toJSONString(sc);
-
-
-        String s = PlaceholderUtils.paramPlaceholder(jsonString, "2020/3/12 15:13");
-        System.out.println(s);*/
-
-/*
-        System.out.println(initCommand("python ${biz_file}","D:/2020project/byit-myth-job/demo-client/byit-demo-client/src/main/java/com/byit/job/Mains.java"));
-*/
-        System.out.println(commandReplace("python test.py", new HashMap<String, String>() {{
-            put("name", "张三");
-            put("age", "14");
-            put("sex", "男");
-        }}));
-
-    }
-
 }