diff --git a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java index fdcd8dfb..89b97a59 100644 --- a/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java @@ -115,7 +115,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl dispatchSumVos = null; - if(supplierCodeList.size()>0){ + if(supplierCodeList!=null&&supplierCodeList.size()>0){ dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,currMonthNum,supplierCodeList); } for (BirRoiCostItemVo costItemVo : costItemVoList) { @@ -313,6 +313,9 @@ public class BirRoiRateServiceImpl extends ServiceImpl supplierCodeList = getBiRoiCostDTOAndFindSupplierCodes(costDTO, supplierId, loadType, userId); + if(supplierCodeList==null||supplierCodeList.size()==0){ + return 0F; + } Float tempPercent = getPercentDate(costDTO,supplierCodeList); return tempPercent; } diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index a24edf4e..a887ef2a 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -446,13 +446,16 @@ public class TbsCostApplyServiceImpl extends ServiceImpl> supplierCodeMapWithCenterType = new HashMap<>(); Map> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(TbsActivityCenter::getCenterType)); for (String centerType : centerMapList.keySet()) { - List centerIds =centerMapList.get(centerType).stream().map(a->a.getCenterId()).collect(Collectors.toList()); + List centerIds =centerMapList.get(centerType).stream().map(TbsActivityCenter::getCenterId).collect(Collectors.toList()); List supplierCodeList = roiRateService.getSupplierCodesByCenter(costDTO,centerType,centerIds); //发货单 List dispatchSumVos = null; - if(supplierCodeList.size()>0){ + if(supplierCodeList!=null&&supplierCodeList.size()>0){ dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,endMonthNum,supplierCodeList); supplierCodeMapWithCenterType.put(centerType,dispatchSumVos); + }else { + //防止后面获取空指针 + supplierCodeMapWithCenterType.put(centerType,new ArrayList<>()); } }