From c06b174be6d9a7bb479abc4e470c006b0f621023 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Thu, 5 Sep 2024 10:15:13 +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-=E5=8F=AF=E8=83=BD=E5=AD=98=E5=9C=A8=E7=9A=84NPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/chart/manage/ChartViewThresholdManage.java | 2 +- de-xpack | 2 +- 2 files changed, 2 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 c4c195a729..09277f7381 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 @@ -219,7 +219,7 @@ public class ChartViewThresholdManage { if (ObjectUtils.isEmpty(fieldDTO)) continue; String fieldDTOName = fieldDTO.getName(); String dataeaseName = fieldDTO.getDataeaseName(); - List valueList = rows.stream().map(row -> row.get(dataeaseName).toString()).collect(Collectors.toList()); + List valueList = rows.stream().map(row -> ObjectUtils.isEmpty(row.get(dataeaseName)) ? null : row.get(dataeaseName).toString()).collect(Collectors.toList()); String replacement = fieldDTOName + ": " + JsonUtil.toJSONString(valueList); // 替换文本 matcher.appendReplacement(sb, replacement); diff --git a/de-xpack b/de-xpack index 08153f88e0..f0301c703b 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit 08153f88e0d2cf6bc560a63ab84afdb8339dc6c1 +Subproject commit f0301c703bfff22a05b3e38ac49200dae49ac1e9