From 2a2de5f829284f3a02091a42405b4ee28de51a93 Mon Sep 17 00:00:00 2001
From: xiajunjie <752696511@qq.com>
Date: Wed, 23 Jun 2021 20:54:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A7=86=E5=9B=BE=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E5=AE=B9=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/provider/mysql/MysqlQueryProvider.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
index 13910bb78d..03cf85e294 100644
--- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
@@ -6,6 +6,7 @@ import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.provider.QueryProvider;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -374,6 +375,9 @@ public class MysqlQueryProvider extends QueryProvider {
         for (ChartCustomFilterDTO request : requestList) {
             String value = request.getValue();
             DatasetTableField field = request.getField();
+            if (ObjectUtils.isEmpty(field)) {
+                continue;
+            }
             if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
                 filter.append(" AND FROM_UNIXTIME(cast(")
                         .append(field.getOriginName())