From be7360b89a26a4ab7e532bb47758cfc8b412bb19 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Sat, 15 Jul 2023 14:15:10 +0800
Subject: [PATCH] =?UTF-8?q?subList=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/bir/service/impl/BirRoiRateServiceImpl.java    | 5 ++++-
 .../modules/tbs/service/impl/TbsCostApplyServiceImpl.java  | 7 +++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

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<BirRoiRateMapper,BirRoiRa
 
         //发货单
         List<ErpDispatchSumVo> 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<BirRoiRateMapper,BirRoiRa
     private Float getPercenDateByLoadType(Integer loadType,BirRoiCostDTO oriCostDTO,String supplierId,String userId){
         BirRoiCostDTO costDTO = CopierUtil.copy(oriCostDTO,new BirRoiCostDTO());
         List<String> 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<TbsCostApplyMapper,TbsC
         Map<String,List<ErpDispatchSumVo>> supplierCodeMapWithCenterType = new HashMap<>();
         Map<String,List<TbsActivityCenter>> centerMapList = tbsActivityCenters.stream().collect(Collectors.groupingBy(TbsActivityCenter::getCenterType));
         for (String centerType : centerMapList.keySet()) {
-            List<String> centerIds =centerMapList.get(centerType).stream().map(a->a.getCenterId()).collect(Collectors.toList());
+            List<String> centerIds =centerMapList.get(centerType).stream().map(TbsActivityCenter::getCenterId).collect(Collectors.toList());
             List<String> supplierCodeList = roiRateService.getSupplierCodesByCenter(costDTO,centerType,centerIds);
             //发货单
             List<ErpDispatchSumVo> 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<>());
             }
         }