fix: 修复创建司机bug

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()) {

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");