From a417f2453cf99d7f771275b06329ae0d0ef39fcc Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Wed, 23 Oct 2024 12:18:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E5=8F=B8=E6=9C=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BasicdataDriverArteryController.java          |  2 +-
 .../service/impl/TrunklineAdvanceServiceImpl.java | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
index e89e521b1..3b73888a8 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataDriverArteryController.java
@@ -199,7 +199,7 @@ public class BasicdataDriverArteryController extends BladeController {
 			return R.fail("请输入司机手机号码!!!");
 		}
 		List<BasicdataDriverArteryEntity> list2 = basicdataDriverArteryService.list(Wrappers.<BasicdataDriverArteryEntity>query().lambda()
-			.eq(BasicdataDriverArteryEntity::getUserId, AuthUtil.getUserId())
+			.eq(BasicdataDriverArteryEntity::getPhone, phone)
 			.eq(BasicdataDriverArteryEntity::getIsDeleted, 0)
 		);
 		if (!list2.isEmpty()) {
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
index 668b7a737..9880c1589 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineAdvanceServiceImpl.java
@@ -288,14 +288,15 @@ public class TrunklineAdvanceServiceImpl extends BaseServiceImpl<TrunklineAdvanc
 				parcelList.setMaterialUnit(materialEntity.getSpecification());
 			}
 		}else{
-			BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(materialId);
-			if(!Objects.isNull(materialOwnId)){
-				parcelList.setMaterialId(materialOwnId.getId());
-				parcelList.setMaterialName(materialOwnId.getName());
-				parcelList.setMaterialCode(materialOwnId.getProductCode());
-				parcelList.setMaterialUnit(materialOwnId.getSpecification());
+			if(!Objects.isNull(materialId)){
+				BasicMaterialEntity materialOwnId = basicMaterialClient.getMaterialOwnId(materialId);
+				if(!Objects.isNull(materialOwnId)){
+					parcelList.setMaterialId(materialOwnId.getId());
+					parcelList.setMaterialName(materialOwnId.getName());
+					parcelList.setMaterialCode(materialOwnId.getProductCode());
+					parcelList.setMaterialUnit(materialOwnId.getSpecification());
+				}
 			}
-
 		}
 		parcelList.setBrandName(advanceDetailEntity.getBrand());
 		parcelList.setOrderPackageStatus("20");