From 552ab4679286451b91cc11c322036a0bce264ff9 Mon Sep 17 00:00:00 2001 From: ulleo Date: Fri, 22 Dec 2023 18:28:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8C=BA=E9=97=B4=E6=9D=A1=E5=BD=A2?= =?UTF-8?q?=E5=9B=BE=E8=81=94=E5=8A=A8=E5=8F=AF=E8=83=BDNPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../io/dataease/service/chart/util/ChartDataBuild.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java b/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java index c7bb427482..a214d94f28 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java +++ b/core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java @@ -1412,8 +1412,14 @@ public class ChartDataBuild { } if (isDate) { - map.put("minTime", sdf.format(dates.stream().min(Date::compareTo).orElse(null))); - map.put("maxTime", sdf.format(dates.stream().max(Date::compareTo).orElse(null))); + Date minDate = dates.stream().min(Date::compareTo).orElse(null); + if (minDate != null) { + map.put("minTime", sdf.format(minDate)); + } + Date maxDate = dates.stream().max(Date::compareTo).orElse(null); + if (maxDate != null) { + map.put("maxTime", sdf.format(maxDate)); + } } else { map.put("min", numbers.stream().min(BigDecimal::compareTo).orElse(null)); map.put("max", numbers.stream().max(BigDecimal::compareTo).orElse(null));