Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_temp

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/DistributionServiceImpl.java

@@ -62,7 +62,8 @@ public class DistributionServiceImpl implements DistributionService {
         if (null == branchCountFormDTO){
             return new BranchCountResultDTO();
         }
-        branchCountResultDTO.setTotalNum(screenCustomerGridDao.selectBranchCount(branchCountFormDTO.getAgencyId()));
+        Integer totalNum = screenCustomerGridDao.selectBranchCount(branchCountFormDTO.getAgencyId());
+        branchCountResultDTO.setTotalNum(null == totalNum ? NumConstant.ZERO : totalNum);
         return branchCountResultDTO;
     }