From 8090be01113384016da0b911659ec8fb34fb185f Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Tue, 25 Jun 2024 18:36:19 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90=E6=89=93?=
 =?UTF-8?q?=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java  | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 4770ad406..9035047be 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -4849,13 +4849,13 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			List<DistrilbutionBillPackageEntity> distrilbutionBillPackageEntities = distrilbutionBillPackageMapper.selectList(distrilbutionBillStockEntityLambdaQueryWrapper);
 
 
-			Set<Long> ids = new HashSet<Long>();
-			for (DistrilbutionBillPackageEntity distrilbutionBillPackageEntity : distrilbutionBillPackageEntities) {
-				ids.add(distrilbutionBillPackageEntity.getParceListId());
-			}
 			// 得到所以的订单列表
-			List<DistributionParcelListEntity> distributionParcelListEntities = distributionParcelListMapper.selectBatchIds(ids);
+			List<DistributionParcelListEntity> distributionParcelListEntities = null;
+			if (!distrilbutionBillPackageEntities.isEmpty()) {
+				List<Long> ids = distrilbutionBillPackageEntities.stream().map(DistrilbutionBillPackageEntity::getParceListId).collect(Collectors.toList());
+				distributionParcelListEntities = distributionParcelListMapper.selectBatchIds(ids);
 
+			}
 
 			Map<String, Object> map = new HashMap<>();
 			map.put("自提单号", distrilbutionBillLadingEntity.getPickupBatch());
@@ -4864,7 +4864,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //			map.put("收货单单位", reservationEntity.getReceivingUnit());//收货单单位
 //			map.put("商场名称", reservationEntity.getStoreName());//商场名称
 			// 构建map集合中收货单和商场名称
-			buildMapByDistrilbutionBillLadingEntity(map, distrilbutionBillStockEntities, distributionParcelListEntities, distrilbutionBillLadingEntity);
+			if (!distributionParcelListEntities.isEmpty() && !distrilbutionBillStockEntities.isEmpty()){
+				buildMapByDistrilbutionBillLadingEntity(map, distrilbutionBillStockEntities, distributionParcelListEntities, distrilbutionBillLadingEntity);
+			}
 			map.put("提货人", distrilbutionBillLadingEntity.getConsignee());//提货人
 			map.put("联系电话", distrilbutionBillLadingEntity.getConsigneePhone());//收货人电话
 			BasicdataWarehouseEntity entityWarehouseId = warehouseClient.getEntityWarehouseId(distrilbutionBillLadingEntity.getWarehouseId());