From 7cb63778d3849e0421ddb37a9b0116ac6a1001a5 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 3 Sep 2024 19:25:21 +0800
Subject: [PATCH] =?UTF-8?q?perf(X-Pack):=20=E9=98=88=E5=80=BC=E5=91=8A?=
 =?UTF-8?q?=E8=AD=A6=E5=9B=BE=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=8C=85=E5=90=AB?=
 =?UTF-8?q?=E7=A9=BA=E5=80=BC=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/chart/manage/ChartViewThresholdManage.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java
index b2f55056a5..a9351b26ef 100644
--- a/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java
+++ b/core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewThresholdManage.java
@@ -335,6 +335,9 @@ public class ChartViewThresholdManage {
         } else {
             String term = item.getTerm();
             if (Objects.equals(deType, DeTypeConstants.DE_STRING)) {
+                if (valueObj == null) {
+                    return StringUtils.equals(term, "null");
+                }
                 if (StringUtils.equals(term, "eq")) {
                     return StringUtils.equals(item.getValue(), valueObj.toString());
                 } else if (StringUtils.equals(term, "not_eq")) {
@@ -348,9 +351,9 @@ public class ChartViewThresholdManage {
                 } else if (StringUtils.equals(term, "not_like")) {
                     return !StringUtils.contains(item.getValue(), valueObj.toString());
                 } else if (StringUtils.equals(term, "null")) {
-                    return valueObj == null;
+                    return false;
                 } else if (StringUtils.equals(term, "not_null")) {
-                    return valueObj != null;
+                    return true;
                 } else if (StringUtils.equals(term, "empty")) {
                     return StringUtils.isBlank(valueObj.toString());
                 } else if (StringUtils.equals(term, "not_empty")) {
@@ -359,6 +362,7 @@ public class ChartViewThresholdManage {
                     return StringUtils.equals(item.getValue(), valueObj.toString());
                 }
             } else if (Objects.equals(deType, DeTypeConstants.DE_INT) || Objects.equals(deType, DeTypeConstants.DE_FLOAT)) {
+                if (valueObj == null) return false;
                 if (StringUtils.equals(term, "eq")) {
                     return StringUtils.equals(item.getValue().toString(), valueObj.toString());
                 } else if (StringUtils.equals(term, "not_eq")) {