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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
chenbo 2023-10-19 16:03:13 +08:00
commit 2fb707edad
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

@ -390,7 +390,7 @@ class VehicleController extends BaseApiController
return $this->fail('非镇街公司不能访问'); return $this->fail('非镇街公司不能访问');
} }
//获取小组服务公司申请信息 //获取小组服务公司申请信息
$vehicleContract_pre = VehicleContract::where('company_a_id',$company['id'])->where('status','in','-1,0,1,2')->limit(4)->order('create_time desc')->select()->toArray(); $vehicleContract_pre = VehicleContract::where('company_a_id',$company['id'])->where('status','in','-1,0,1,2')->where('type','<>',2)->limit(4)->order('create_time desc')->select()->toArray();
$vehicleContract = []; $vehicleContract = [];
foreach ($vehicleContract_pre as $v) { foreach ($vehicleContract_pre as $v) {
$vehicleBuy = VehicleBuyRecord::where('contract_id',$v['id'])->findOrEmpty(); $vehicleBuy = VehicleBuyRecord::where('contract_id',$v['id'])->findOrEmpty();