From 4319627cf67d19093a18ff724c21782e34fc7a26 Mon Sep 17 00:00:00 2001 From: jinpengyong <jpy123456> Date: Tue, 10 Oct 2023 15:44:27 +0800 Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb --- screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/BarChartOfPollutionLevelVO.java | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/BarChartOfPollutionLevelVO.java b/screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/BarChartOfPollutionLevelVO.java index 3625912..0ad900d 100644 --- a/screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/BarChartOfPollutionLevelVO.java +++ b/screen-api/src/main/java/com/moral/api/pojo/vo/cityAQI/BarChartOfPollutionLevelVO.java @@ -3,6 +3,7 @@ import com.moral.api.pojo.dto.cityAQI.MonthlyPollutionLevel; import com.moral.api.pojo.dto.cityAQI.PollutionDaysAndProportion; import lombok.Data; +import org.springframework.util.ObjectUtils; import java.util.ArrayList; import java.util.HashMap; @@ -29,6 +30,8 @@ List<Map<String, Object>> values; public static BarChartOfPollutionLevelVO convert(List<MonthlyPollutionLevel> datas) { + if(ObjectUtils.isEmpty(datas)) + return null; BarChartOfPollutionLevelVO vo = new BarChartOfPollutionLevelVO(); List<String> time = new ArrayList<>(); List<Map<String, Object>> values= new ArrayList<>(); -- Gitblit v1.8.0