From 91df5a7e7329608ed946ceb2b36d51abffffaad7 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sat, 28 Sep 2024 22:12:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=8F=B8=E6=9C=BAID?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java      | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 e0c480ced..71ee18adc 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
@@ -3021,7 +3021,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 		DistributionLoadscaninvnEntity distributionLoadscanEntity = pushList.get(0);
 		distributionLoadVO.setDriverName(distributionLoadscanEntity.getDriverName());
-		distributionLoadVO.setDriverId(Convert.toStr(AuthUtil.getUserId()));
+		distributionLoadVO.setDriverId(distributionLoadscanEntity.getDriverId());
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 		distributionLoadVO.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
@@ -3084,7 +3084,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 		DistributionLoadscanEntity distributionLoadscanEntity = pushList.get(0);
 		distributionLoadVO.setDriverName(distributionLoadscanEntity.getDriverName());
-		distributionLoadVO.setDriverId(Convert.toStr(AuthUtil.getUserId()));
+		distributionLoadVO.setDriverId(distributionLoadscanEntity.getDriverId());
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 
@@ -6017,7 +6017,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 		DistributionLoadscanEntity distributionLoadscanEntity = distributionLoadscanEntityLists.get(0);
 		distributionLoadVO.setDriverName(distributionLoadscanEntity.getDriverName());
-		distributionLoadVO.setDriverId(Convert.toStr(AuthUtil.getUserId()));
+		distributionLoadVO.setDriverId(distributionLoadscanEntity.getDriverId());
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 		distributionLoadVO.setReservationCode(reservationEntity.getReservationCode());
@@ -6905,7 +6905,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		DistributionLoadscanEntity distributionLoadscanEntity = pushList.get(0);
 		distributionLoadVO.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 		distributionLoadVO.setDriverName(distributionLoadscanEntity.getDriverName());
-		distributionLoadVO.setDriverId(Convert.toStr(AuthUtil.getUserId()));
+		distributionLoadVO.setDriverId(distributionLoadscanEntity.getDriverId());
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 		DistributionReservationEntity byId = distributionReservationService.getById(distributionLoadscanEntity.getReservationId());