添加修改停靠公司调度记录

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -292,10 +292,12 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 for (Vehicle exitsVehicle : exitsVehicles) {
                     if (exitsVehicle.getId().equals(addOrUpdateVehicleVo.getId())) {
                         //如果修改的有停靠分公司，需要添加一条调度记录
-                        if (exitsVehicle.getParkBranchCompanyId() != addOrUpdateVehicleVo.getParkBranchCompanyId()) {
+                        Vehicle vehicle1 = selectById(exitsVehicle.getId());
+                        if (vehicle1 != null) {
+                            if (vehicle1.getParkBranchCompanyId() != addOrUpdateVehicleVo.getParkBranchCompanyId()) {
                                 VehicleBookRecord vehicleBookRecord = new VehicleBookRecord();
                                 vehicleBookRecord.setRetCompany(addOrUpdateVehicleVo.getParkBranchCompanyId());
-                            vehicleBookRecord.setLiftCompany(exitsVehicle.getParkBranchCompanyId());
+                                vehicleBookRecord.setLiftCompany(vehicle1.getParkBranchCompanyId());
                                 vehicleBookRecord.setRemark("后台修改停靠公司，调度车辆");
                                 vehicleBookRecord.setBookStartDate(new Date());
                                 vehicleBookRecord.setBookEndDate(new Date());
@@ -305,7 +307,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                                 vehicleBookRecord.setBookUserName(userDTO.getUsername());
                                 vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
                                 vehicleBookRecord.setBookType(BookType.DISPATCH.getCode());
-                            vehicleBookRecord.setVehicleId(exitsVehicle.getId());
+                                vehicleBookRecord.setVehicleId(vehicle1.getId());
                                 vehicleBookRecord.setVehicleUsername(userDTO.getUsername());
                                 vehicleBookRecord.setVehicleUserPhone(userDTO.getUsername());
                                 ObjectRestResponse objectRestResponse = addVehicleBookRecord(vehicleBookRecord);
@@ -317,6 +319,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
 
                             }
                         }
+
+                    }
                     return RestResponse.codeAndMessage(ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getCode(),
                             ResCode.VEHICLE_INFO_SAME_NUM_PLATE_EXISTS.getDesc());