From 5d948d6bea4438c240e934d64f67f26ffc309995 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Wed, 4 Sep 2024 11:47:32 +0800 Subject: [PATCH] =?UTF-8?q?fix(X-Pack):=20=E9=98=88=E5=80=BC=E5=91=8A?= =?UTF-8?q?=E8=AD=A6-=E6=B7=B7=E5=90=88=E7=B1=BB=E5=9E=8B=E5=9B=BE?= =?UTF-8?q?=E8=A1=A8=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/chart/manage/ChartViewThresholdManage.java | 3 +++ de-xpack | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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> tableRow = (List>) data.get("tableRow"); List fields = (List) data.get("fields"); + if (CollectionUtils.isEmpty(fields)) { + return new ThresholdCheckVO(false, null, String.format("当前图表类型[%s]暂不支持阈值告警！", chart.getType()), null); + } Map fieldMap = fields.stream().collect(Collectors.toMap(DatasetTableFieldDTO::getId, item -> item)); FilterTreeObj filterTreeObj = JsonUtil.parseObject(thresholdRules, FilterTreeObj.class); List> 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