From 915b540380adbcb48d04414467e549c8c1cfdde2 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 08:52:42 +0800
Subject: [PATCH] 'commit'

---
 .../base/DataEase/Util/Step2_CopyFilter.java      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 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 3615e28a..40034a3b 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
@@ -125,16 +125,25 @@ public class Step2_CopyFilter {
         String custom_filter_json = cn.hutool.core.io.FileUtil.readUtf8String(PathKit.getRootClassPath() + "/Data/filter.json");
         for (Record record : list) {
             long id = record.getLong("id");
-            long fieldId = mapField.get(id);
+
+            long fieldId = -1;
+            if (mapField.containsKey(id)) {
+                fieldId = mapField.get(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);
-                jo.getJSONArray("items").getJSONObject(0).put("fieldId", fieldId);
+                if (fieldId > 0) {
+                    jo.getJSONArray("items").getJSONObject(0).put("fieldId", fieldId);
+                }
             } else {
                 JSONObject newJo = JSONObject.parseObject(custom_filter_json).getJSONArray("items").getJSONObject(0);
-                newJo.put("fieldId", fieldId);
+                if (fieldId > 0) {
+                    newJo.put("fieldId", fieldId);
+                }
                 jo.getJSONArray("items").add(newJo);
             }
             sql = "update core_chart_view set custom_filter=? where id=?";