Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into master_saas

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/IndexBaseDto.java

@@ -35,7 +35,7 @@ public class IndexBaseDto {
     public void setOrganIndexMonthData(List<IndexBaseMonthData> organIndexMonthData) {
         Map<Integer,BigDecimal> organData = new HashMap<>(20);
         if (!CollectionUtils.isEmpty(organIndexMonthData)){
-            List<IndexBaseMonthData> collect = organIndexMonthData.stream().filter(e -> e.getOrganId() != 0).collect(Collectors.toList());
+            List<IndexBaseMonthData> collect = organIndexMonthData.stream().filter(e -> e.getOrganId() != null && e.getOrganId() != 0).collect(Collectors.toList());
             if(!CollectionUtils.isEmpty(collect)){
                 Map<Integer, List<IndexBaseMonthData>> listMap = collect.stream().collect(Collectors.groupingBy(IndexBaseMonthData::getOrganId));
                 listMap.keySet().stream().forEach(organId->organData.put(organId,listMap.get(organId).stream().map(e->e.getPercent()).reduce(BigDecimal.ZERO,BigDecimal::add)));