运营情况导出例行工作次数2

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -2097,19 +2097,21 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve
             }
             //例行工作次数累加
             int patrolRoutineWorkTimes = NumConstant.ZERO;
-            workCountListTemp = workCountMap.get(org.getOrgId());
+            if (workCountMap != null){
-            if (CollectionUtils.isNotEmpty(workCountListTemp)) {
+                workCountListTemp = workCountMap.get(org.getOrgId());
-                if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
+                if (CollectionUtils.isNotEmpty(workCountListTemp)) {
-                    for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
+                    if (OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
-                        patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
-                        set.add(work.getStaffId());
-                    }
-                } else {
-                    if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
                         for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
                             patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
                             set.add(work.getStaffId());
                         }
+                    } else {
+                        if (!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel())) {
+                            for (CustomerDataManageResultDTO.CustomerDataManage work : workCountListTemp) {
+                                patrolRoutineWorkTimes += work.getPatrolRoutineWorkTimes();
+                                set.add(work.getStaffId());
+                            }
+                        }
                     }
                 }
             }