Merge remote-tracking branch 'origin/v1.0' into v1.0

src/main/java/com/qs/serve/modules/bir/service/impl/BirRoiRateServiceImpl.java

@@ -114,7 +114,7 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
 
         //发货单
         List<ErpDispatchSumVo> dispatchSumVos = null;
-        if(supplierCodeList.size()>1){
+        if(supplierCodeList.size()>0){
             dispatchSumVos = dispatchDataMapper.querySumCost(startMonthNum,currMonthNum,supplierCodeList);
         }
         for (BirRoiCostItemVo costItemVo : costItemVoList) {
@@ -361,7 +361,9 @@ public class BirRoiRateServiceImpl extends ServiceImpl<BirRoiRateMapper,BirRoiRa
             //3->客户的销售区域
             if (checkNotNullVale(bmsSupplier.getRegionSecond())){
                 lqw.eq(BmsSupplier::getRegionSecond,bmsSupplier.getRegionSecond());
-            }else{
+            }else if(checkNotNullVale(bmsSupplier.getRegionFirst())){
+                lqw.eq(BmsSupplier::getRegionFirst,bmsSupplier.getRegionFirst());
+            }else {
                 lqw.eq(BmsSupplier::getId,"0");
             }
         }