'commit'

src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java

@@ -102,7 +102,7 @@ public class Step2_CopyFilter {
         jo.put("pid", pid);
         String res = HttpUtil.createPost(url).contentType("application/json")
                 .header("x-de-token", getToken()).body(jo.toString()).execute().body();
-        Thread.sleep(1500);
+        Thread.sleep(2000);
         long childId = Long.parseLong(JSONObject.parseObject(res).getString("data"));
 
         //更新pid,没有这步的话，在界面上看不到拷贝出来的大屏！
@@ -155,6 +155,7 @@ public class Step2_CopyFilter {
             long id = record.getLong("id");
             String custom_filter = record.getStr("custom_filter");
             JSONObject jo = JSONObject.parseObject(custom_filter);
+            jo.put("logic","and");
             if (jo.getJSONArray("items") == null) {
                 jo=JSONObject.parseObject(custom_filter_json);
             } else {

src/main/resources/Data/filter.json

@@ -1,5 +1,5 @@
 {
-  "logic": "or",
+  "logic": "and",
   "items": [
     {
       "type": "item",