Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -3576,10 +3576,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				break;
 		}
 		List<DistributionDeliverySelfDTO> allocationInfo = deliveryListDTO.getAllocationInfo();
-		if (Strings.isBlank(deliveryListDTO.getMasterDriverName())){
-			//无主司机信息  进行主司机默认赋予
-			deliveryListDTO.setMasterDriverName(allocationInfo.get(0).getDriverName());
-		}
 		if (Func.isEmpty(allocationInfo)) {
 			//这里就表示是三方配送
 			DistributionDeliveryTripartiteDTO tripartite = deliveryListDTO.getTripartite();

blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/ReportDeliverServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.report.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -36,6 +37,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springframework.stereotype.Service;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -194,6 +196,9 @@ public class ReportDeliverServiceImpl implements ReportDeliverService {
 			limitB = zeroSize;
 			page1.setSize(zeroSize);
 			List<ReportDetailVO> zeroPage = reportDeliverMapeer.getDetailsZeroPage(limitA, limitB, queryWrapper);
+			if(CollUtil.isEmpty(detailsPage)){
+				detailsPage = new ArrayList<>();
+			}
 			detailsPage.addAll(zeroPage);
 		}
 		page.setTotal(allTotal);