From 7f3a4f9f979c00ff454168900325d7bc0267a56b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98chaoosc=E2=80=99?= <‘chaoosc@gmail.com’>
Date: Sat, 21 Oct 2023 03:17:33 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E9=85=8D=E9=80=81=E5=8D=95?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E4=BB=BB=E5=8A=A1=E5=90=8E=E7=9A=84=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionDeliveryListServiceImpl.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 4a263b54a..c2aa2469a 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
@@ -3416,7 +3416,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //		DistributionStockupVO stockupEntity = distributionStockupMapper.getDeliveryStockupInfo(id);
 //		deliveryListVO.setStockupInfo(stockupEntity);
 		List<DistributionReservationEntity> reservationVOS = distributionReservationMapper.getMarketReservationInfo(id);
-		deliveryListVO.setReservationInfos(DistributionReservationWrapper.build().listVO(reservationVOS));
+		if(ObjectUtil.isNotEmpty(reservationVOS)){
+			deliveryListVO.setReservationInfos(DistributionReservationWrapper.build().listVO(reservationVOS));
+
+		}
 		return deliveryListVO;
 	}