增加非空判断

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java

@@ -179,11 +179,19 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
         Map<String,List<String>> inverterMap=dataJpInverter.stream().collect(Collectors.groupingBy(JpInverter::getThirdStationId,Collectors.mapping(JpInverter::getSnCode,Collectors.toList())));
         List<JpStation> list= jpStationMapper.getJpStationList(reviewDto);
         list.forEach(jpStation -> {
-            List<String> sncodes =inverterMap.get(jpStation.getThirdStationId()).stream().distinct().collect(Collectors.toList());
-            sncodes = sncodes.stream().filter(s->s.trim().length()>1).collect(Collectors.toList());
-            jpStation.setSnCodes(sncodes);
+
+            if(inverterMap.containsKey(jpStation.getThirdStationId())){
+
+                List<String> sncodes =inverterMap.get(jpStation.getThirdStationId())!=null?inverterMap.get(jpStation.getThirdStationId()).stream().distinct().collect(Collectors.toList()):null;
+                sncodes = sncodes!=null?sncodes.stream().filter(s->s.trim().length()>1).collect(Collectors.toList()):null;
+                jpStation.setSnCodes(sncodes);
+
+            }
+
+
+
         });
-        list =list.stream().filter(jpStation -> jpStation.getSnCodes().size()>0).collect(Collectors.toList());
+        list =list.stream().filter(jpStation -> jpStation.getSnCodes()!=null&&jpStation.getSnCodes().size()>0).collect(Collectors.toList());
         return list;
     }
     @Override