Merge branch 'master-change-arrival-company' into dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java

@@ -338,11 +338,11 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
             bookRecordUpdateLog.setOperaterId(userDTO.getId());
             bookRecordUpdateLog.setOperaterName(userDTO.getName());
             bookRecordUpdateLog.setCreateTime(new Date());
-            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(vehicleBookRecord.getId());
+            VehicleDepartureLogVo vehicleDepartureLogVo = vehicleDepartureService.getByRecordId(oldValue.getId());
             if (vehicleDepartureLogVo != null && vehicleDepartureLogVo.getState() == 0) {
-                Vehicle vehicle = vehicleBiz.selectById(vehicleBookRecord.getVehicleId());
+                Vehicle vehicle = vehicleBiz.selectById(oldValue.getVehicleId());
                 if (vehicle != null) {
-                    vehicle.setParkBranchCompanyId(vehicleBookRecord.getRetCompany());
+                    vehicle.setParkBranchCompanyId(oldValue.getRetCompany());
                     vehicleBiz.updateSelectiveByIdRe(vehicle);
                 }
             }