public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-06-12 08:21:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7300 from ulleo/dev

Browse Source 
fix: 区间条形图联动可能NPE
This commit is contained in:
ulleo
2023-12-22 18:28:43 +08:00
committed by GitHub
parent af8a8b284c 552ab46792
commit 15d449d30a
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/backend/src/main/java/io/dataease/service/chart/util/ChartDataBuild.java
View File

@@ -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));