diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php index 8e5181937..a8d16aa3b 100644 --- a/app/adminapi/controller/contract/VehicleContractController.php +++ b/app/adminapi/controller/contract/VehicleContractController.php @@ -41,7 +41,7 @@ class VehicleContractController extends BaseAdminController 'status' => 1, ]; //判断合同类型 - if($vehicle_contract['type'] == 0){ + if($vehicle_contract['type'] == 0 && $vehicle_contract['contract_logistic_id'] != 0){ $data['cars_info'] = $params['cars']; } if(!empty($vehicle_contract['contract_logistic_id'])){ diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php index 05bce77d7..d25e756d1 100644 --- a/app/api/controller/VehicleController.php +++ b/app/api/controller/VehicleController.php @@ -199,7 +199,7 @@ class VehicleController extends BaseApiController } //小组服务公司租赁申请 - public function rentApply() { + public function rentApply() { //验证请求类型 if(!$this->request->isPost()){ return $this->fail('请求类型错误'); @@ -730,6 +730,7 @@ class VehicleController extends BaseApiController } //如果有租赁车俩和上传自有车辆,但没有购买镇街公司租赁的车辆 则先向镇街公司发起解约合同 if(!$xzRentCars->isEmpty() && $zjRentCars->isEmpty()){ + dump(333);die; //获取自有车辆或以租赁车辆信息 //生成本地解约合同 VehicleContract::create([