Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
2fb707edad
@ -390,7 +390,7 @@ class VehicleController extends BaseApiController
|
||||
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 = [];
|
||||
foreach ($vehicleContract_pre as $v) {
|
||||
$vehicleBuy = VehicleBuyRecord::where('contract_id',$v['id'])->findOrEmpty();
|
||||
|
Loading…
x
Reference in New Issue
Block a user