diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php index f72154ac4..1fc38031a 100755 --- a/app/api/controller/IndexController.php +++ b/app/api/controller/IndexController.php @@ -335,7 +335,7 @@ class IndexController extends BaseApiController //获取租赁车辆信息 $vehicleRentInfo = VehicleRent::where('car_id', $vehicle['id'])->find(); //更新原始合同类型 - VehicleContract::where('id', $vehicleRentInfo['contract_id'])->update(['type' => 2]); + VehicleContract::where('id', $vehicleRentInfo['contract_id'])->update(['status' => 6]); VehicleRent::where('car_id', $vehicle['id'])->update([ 'status' => 3, ]); diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index 471c8f776..2c6bdc2e9 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -237,7 +237,7 @@ class VehicleController extends BaseApiController return $this->fail('当前镇街公司未签约'); } //判断是否申请过 - $vehicleContract = VehicleContract::where('company_b_id',$this->userInfo['company_id'])->where('type','<>',2)->where('status','<>',4)->find(); + $vehicleContract = VehicleContract::where('company_b_id',$this->userInfo['company_id'])->where('type','<>',2)->whereNotIn('status','4,5,6')->find(); if(!empty($vehicleContract)){ return $this->fail('请勿重复申请'); }