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

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

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

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

@ -298,7 +298,7 @@ class VehicleController extends BaseApiController
return $this->fail('非镇街公司不能访问');
}
//获取小组服务公司申请信息
$vehicleContract = VehicleContract::where('company_a_id',$company['id'])->where('status',-1)->limit(2)->order('create_time desc')->select()->toArray();
$vehicleContract = VehicleContract::where('company_a_id',$company['id'])->where('status','in','-1,0,1,2')->limit(2)->order('create_time desc')->select()->toArray();
//获取车辆列表
$vehicleRentCars = VehicleRent::where('company_id',$company['id'])->select()->each(function($item){
if($item['status'] == 2){