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 a9351b26ef..c4c195a729 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
@@ -199,6 +199,9 @@ public class ChartViewThresholdManage {
             thresholdTemplate = convertStyle(thresholdTemplate.replace("[触发告警]", s));
             List<Map<String, Object>> tableRow = (List<Map<String, Object>>) data.get("tableRow");
             List<DatasetTableFieldDTO> fields = (List<DatasetTableFieldDTO>) data.get("fields");
+            if (CollectionUtils.isEmpty(fields)) {
+                return new ThresholdCheckVO(false, null, String.format("当前图表类型[%s]暂不支持阈值告警！", chart.getType()), null);
+            }
             Map<Long, DatasetTableFieldDTO> fieldMap = fields.stream().collect(Collectors.toMap(DatasetTableFieldDTO::getId, item -> item));
             FilterTreeObj filterTreeObj = JsonUtil.parseObject(thresholdRules, FilterTreeObj.class);
             List<Map<String, Object>> rows = filterRows(tableRow, filterTreeObj, fieldMap);
diff --git a/de-xpack b/de-xpack
index f13cef680d..321bac2953 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit f13cef680d79dcc02bd6ef7aa08d65765a749eb9
+Subproject commit 321bac2953ac01b12ae69a4e9beb050e0895f965