From 903fe6f60b0a4520830cc2d2a7c1f7e8cb08b30a Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 10 Oct 2024 20:22:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E5=91=98=E6=93=8D=E4=BD=9C=E9=85=8D?=
 =?UTF-8?q?=E9=80=81=E6=8F=90=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionSignforServiceImpl.java       | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 62dc62ac9..5d750843a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -4820,6 +4820,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(distributionSignforEntity.getDeliveryId());
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(distributionSignforEntity.getReservationId());
 		DistributionPositioningEntity distributionPositioning = createdDistributionPositioningEntity(deliveryListEntity, reservationEntity, AuthUtil.getUser(), driver, positioning);
+		if (Objects.isNull(distributionPositioning)){
+		 return Resp.scanFail("当前操作由司机完成", "当前操作由司机完成");
+		}
 		//进行打卡信息保存
 		distributionPositioningService.save(distributionPositioning);
 		NodeFanoutMsg<ConsigneeArriveVO> nodeFanoutMsg = buildConsigneeArriveVO(deliveryListEntity, reservationEntity, add, user);
@@ -4841,9 +4844,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionPositioningEntity.setOperationUsername(user.getNickName());
 		distributionPositioningEntity.setOperationId(user.getUserId());
 		if ("1".equals(deliveryListEntity.getKind())) {
-			DistributionDeliverySelfEntity deliverySelfEntity = distributionDeliveryListService.getDriver(deliveryListEntity, user, null, driver);
-			distributionPositioningEntity.setVehicleNumber(deliverySelfEntity.getVehicleNub());
-			distributionPositioningEntity.setVehicleId(Long.parseLong(deliverySelfEntity.getVehicleId()));
+			if (driver){
+				DistributionDeliverySelfEntity deliverySelfEntity = distributionDeliveryListService.getDriver(deliveryListEntity, user, null, driver);
+				distributionPositioningEntity.setVehicleNumber(deliverySelfEntity.getVehicleNub());
+				distributionPositioningEntity.setVehicleId(Long.parseLong(deliverySelfEntity.getVehicleId()));
+			}else {
+				return null;
+			}
+
 		}
 		return distributionPositioningEntity;