From eb9d8526eb94147fdb57bc8a4c6c30104dc957b7 Mon Sep 17 00:00:00 2001 From: liyuchen <791867849@qq.com> Date: Mon, 17 Apr 2023 13:56:36 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E9=81=BF=E5=85=8D?= =?UTF-8?q?key=E4=B8=BAnull=E7=9A=84=E9=94=99=E8=AF=AF-liyuchen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kening/vordm/service/impl/DisasterInfoServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java index b25c699..12632d7 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/DisasterInfoServiceImpl.java @@ -197,7 +197,7 @@ implements DisasterInfoService { private Map disasterCountryProportion(List disasterInfoList){ Map proportionMap; //根据国家分组统计次数以及总灾害的占比 - proportionMap = disasterInfoList.stream().collect(Collectors.groupingBy(DisasterInfo::getDisasterCountry,Collectors.counting())); + proportionMap = disasterInfoList.stream().filter(data->data.getDisasterCountry()!=null).collect(Collectors.groupingBy(DisasterInfo::getDisasterCountry,Collectors.counting())); return proportionMap; } @@ -207,7 +207,7 @@ implements DisasterInfoService { */ private Map disasterNumProportion(){ List disasterInfoList = baseMapper.getAllData(); - Map proportionMap = disasterInfoList.stream().collect(Collectors.groupingBy(DisasterInfo::getDictValue,Collectors.counting())); + Map proportionMap = disasterInfoList.stream().filter(data->data.getDictValue()!=null).collect(Collectors.groupingBy(DisasterInfo::getDictValue,Collectors.counting())); return proportionMap; }