mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'update' (#78) from zhangwei into master

Browse Source 
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/78
This commit is contained in:
wei1990 2023-08-31 18:11:16 +08:00
commit 3b772ef5b3
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/api/controller/VehicleController.php
View File

@ -271,15 +271,7 @@ class VehicleController extends BaseApiController
if($vehicleContract['company_a_id'] != $this->userInfo['company_id']){ if($vehicleContract['company_a_id'] != $this->userInfo['company_id']){
return $this->fail('数据不匹配'); return $this->fail('数据不匹配');
} }
if(!empty($vehicleContract['cars_info'])){ $vehicleRentCars = VehicleRent::where('company_id',$vehicleContract['company_a_id'])->select()->toArray();
$vehicleContract['cars_info'] = json_decode($vehicleContract['cars_info'],true);
}
//判断申请状态
if($vehicleContract['status'] == -1){
$vehicleRentCars = VehicleRent::where('company_id',$vehicleContract['company_a_id'])->where('status',0)->select()->toArray();
}else{
$vehicleRentCars = [];
}
$data = [ $data = [
'vehicleContract' => $vehicleContract->toArray(), 'vehicleContract' => $vehicleContract->toArray(),
'vehicleRentCars' => $vehicleRentCars 'vehicleRentCars' => $vehicleRentCars