Merge remote-tracking branch 'origin/dev' into dev

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;