统计表一修改

ruoyi-admin/src/main/java/com/ruoyi/web/controller/demo/controller/ReportController.java

@@ -65,9 +65,9 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
                 tmpResult = qiquMap.get(orhonFgqy.getDeptId());
             }
             tmpResult.setDwl(tmpResult.getDwl() + 1);
-            if ( orhonFgqy.getType().equals("1")) {
+            if (orhonFgqy.getType()!=null && orhonFgqy.getType().equals("1")) {
                 tmpResult.setGmysfgqy(tmpResult.getGmysfgqy() + 1);
-            } else if ( orhonFgqy.getType().equals("2")) {
+            } else if (orhonFgqy.getType()!=null &&  orhonFgqy.getType().equals("2")) {
                 tmpResult.setGmyxfgqy(tmpResult.getGmyxfgqy() + 1);
             }
 
@@ -135,6 +135,10 @@ public class ReportController extends com.ruoyi.common.core.controller.BaseContr
         List<ReportOneResult> reportOneResultList = new ArrayList<>(areaList.size());
         for (SysDictData dictData : areaList) {
             ReportOneResult result = qiquMap.get(Long.parseLong(dictData.getDictValue()));
+            if(result == null){
+                result = new ReportOneResult();
+                this.initResult(result);
+            }
             result.setAreaName(dictData.getDictLabel());
 
             reportOneResultList.add(result);