From ab29c6106f028f3947ae13a2c3552a46607c63f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Wed, 18 Dec 2024 07:42:06 +0800
Subject: [PATCH] 'commit'

---
 .../java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java  | 3 ++-
 src/main/resources/Data/filter.json                            | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java b/src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java
index 45f85993..b86ee0e9 100644
--- a/src/main/java/com/dsideal/base/DataEase/Util/Step2_CopyFilter.java
+++ b/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 {
diff --git a/src/main/resources/Data/filter.json b/src/main/resources/Data/filter.json
index 83f9f9b0..0d9b2cea 100644
--- a/src/main/resources/Data/filter.json
+++ b/src/main/resources/Data/filter.json
@@ -1,5 +1,5 @@
 {
-  "logic": "or",
+  "logic": "and",
   "items": [
     {
       "type": "item",