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

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());