加法合并时 空指针修复

src/main/java/com/yihu/quota/service/quota/BaseStatistsService.java

@@ -209,7 +209,9 @@ public class BaseStatistsService {
                map.put(firstColumnField, secondMap.get(firstColumnField));
                for(int i = 0 ;i < moleDimensions.length ; i++){
                    map.put(moleDimensions[i], secondMap.get(moleDimensions[i]).toString());
                    map.put(moleDimensions[i] + "Code", secondMap.get(moleDimensions[i] + "Code").toString());
                    if((moleDimensions[i].equals("town") || moleDimensions[i].equals("org")) && null != secondMap.get(moleDimensions[i] + "Code")) {
                        map.put(moleDimensions[i] + "Code", secondMap.get(moleDimensions[i] + "Code").toString());
                    }
                }
                double point = 0;
                double secondResultVal = Double.valueOf(secondMap.get("result") == null ? "0" : secondMap.get(resultField).toString());
@@ -256,6 +258,8 @@ public class BaseStatistsService {
                }
            }
        }*/
        return  addResultList;
    }
@@ -281,6 +285,24 @@ public class BaseStatistsService {
        return listMap;
    }
    public static List<Map<String, Object>> sortResultListByMonth(List<Map<String, Object>> listMap) {
        if (null != listMap && listMap.size() > 0) {
            Collections.sort(listMap, new Comparator<Map<String, Object>>() {
                @Override
                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                    // 根据month进行升序
                    String month1 = o1.get("month") + "";
                    String month2 = o2.get("month") + "";
                    int v = month1.compareTo(month2);
                    return v > 0 ? 1 : v == 0 ? 0 : -1;
                }
            });
        }
        return listMap;
    }
    /**
     * 两个维度相同指标除法运算
     * @param molecular