diff --git a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java index e4ba8dd8..4210fc0d 100644 --- a/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java +++ b/report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dashboard/service/impl/ReportDashboardServiceImpl.java @@ -446,14 +446,19 @@ public class ReportDashboardServiceImpl implements ReportDashboardService, Initi return data; } //获取时间轴字段和解析时间颗粒度 - chartProperties.forEach((key, value) -> { + + for (Map.Entry entry : chartProperties.entrySet()) { + String key = entry.getKey(); + String value = entry.getValue(); dto.setParticles(value); setTimeLineFormat(dto); if (StringUtils.isNotBlank(dto.getDataTimeFormat())) { dto.setTimeLineFiled(key); - return; + break; } - }); + + } + if (StringUtils.isBlank(dto.getDataTimeFormat())) { return data;