系统报告-数据统计导出时当数据为null时的异常处理

src/main/java/com/sooka/sponest/data/index/service/impl/IndexViewServiceImpl.java

@@ -237,19 +237,30 @@ public class IndexViewServiceImpl extends BaseServiceImpl implements IndexViewSe
         Map<String, Long> message = this.getMessage();
         // 一网通办
         Map<String, Long> oneTongData = this.getOneTongData();
-        // 对各项数据进行合并
+        // 合并各项数据
+        Map<String, Long> systemInfoReportMap = new LinkedHashMap<>();
         // 合并一网通办
-        Map<String, Long> systemInfoReportMap = new LinkedHashMap<>(oneTongData);
+        if (oneTongData != null) {
+            systemInfoReportMap.putAll(oneTongData);
+        }
         // 合并基础数据
-        for (int i = 0; i < basicDataList.size(); i++) {
-            systemInfoReportMap.put("basicDataSubclass" + i, basicDataList.get(i).getSubclass());
-            systemInfoReportMap.put("basicDataCount" + i, basicDataList.get(i).getCount());
+        if (basicDataList != null) {
+            for (int i = 0; i < basicDataList.size(); i++) {
+                systemInfoReportMap.put("basicDataSubclass" + i, basicDataList.get(i).getSubclass());
+                systemInfoReportMap.put("basicDataCount" + i, basicDataList.get(i).getCount());
+            }
         }
         // 合并四长人数、巡护距离
-        systemInfoReportMap.putAll(siZhang);
-        systemInfoReportMap.putAll(fourLengthPatrolDistance);
+        if (siZhang != null) {
+            systemInfoReportMap.putAll(siZhang);
+        }
+        if (fourLengthPatrolDistance != null) {
+            systemInfoReportMap.putAll(fourLengthPatrolDistance);
+        }
         // 合并重点监控领域、各类资源数据
-        systemInfoReportMap.putAll(message);
+        if (message != null) {
+            systemInfoReportMap.putAll(message);
+        }
         return systemInfoReportMap;
     }