From 7c33fc73d84a66e563ff3b6a2f02fe4763b3ce2d Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 12 Apr 2024 09:03:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=9A=E4=B8=AA=E5=8F=B8=E6=9C=BA=E7=9A=84?=
 =?UTF-8?q?=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryListServiceImpl.java  | 34 ++++++++++++++++---
 1 file changed, 30 insertions(+), 4 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 de79c42cc..0463bbd35 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
@@ -340,10 +340,36 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		distributionDeliveryListVO.setReservationList(customList);
 		//查询司机信息
 		if (Objects.equals(distributionDeliveryListVO.getKind(), "1")) {
-			DistributionDeliverySelfEntity deliverySelfServiceOne = distributionDeliverySelfService.getOne(Wrappers.<DistributionDeliverySelfEntity>query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, distributionDeliveryListVO.getId()).eq(DistributionDeliverySelfEntity::getIsMaster, 2));
-			distributionDeliveryListVO.setDriverName(deliverySelfServiceOne.getDriverName());
-			distributionDeliveryListVO.setDriverPhone(deliverySelfServiceOne.getDriverPhone());
-			distributionDeliveryListVO.setVehicleName(deliverySelfServiceOne.getVehicleNub());
+			List<DistributionDeliverySelfEntity> deliverySelfServices = distributionDeliverySelfService.list(Wrappers.<DistributionDeliverySelfEntity>query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, distributionDeliveryListVO.getId()).eq(DistributionDeliverySelfEntity::getIsMaster, 2));
+
+			if(!deliverySelfServices.isEmpty()){
+				StringBuffer sb1 = new StringBuffer();
+				StringBuffer sb2 = new StringBuffer();
+				StringBuffer sb3 = new StringBuffer();
+				deliverySelfServices.forEach(t->{
+					if(!sb1.toString().isEmpty()){
+						sb1.append("/");
+					}
+					sb1.append(t.getDriverName());
+
+					if(!sb2.toString().isEmpty()){
+						sb2.append("/");
+					}
+					sb2.append(t.getDriverPhone());
+
+
+					if(!sb3.toString().isEmpty()){
+						sb3.append("/");
+					}
+					sb3.append(t.getVehicleNub());
+				});
+
+				distributionDeliveryListVO.setDriverName(sb1.toString());
+				distributionDeliveryListVO.setDriverPhone(sb2.toString());
+				distributionDeliveryListVO.setVehicleName(sb3.toString());
+			}
+
+
 		} else {
 			DistributionDeliveryTripartiteEntity deliveryTripartiteEntity = distributionDeliveryTripartiteService.getOne(Wrappers.<DistributionDeliveryTripartiteEntity>query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, distributionDeliveryListVO.getId()));
 			distributionDeliveryListVO.setDriverName(deliveryTripartiteEntity.getDriverName());