Merge pull request '11' (#64) from zhangwei into master
Reviewed-on: http://git.excellentkk.cn/mkm/TaskSystem/pulls/64
This commit is contained in:
commit
d9afdb2e5a
@ -205,6 +205,17 @@ class VehicleController extends BaseApiController
|
|||||||
if(empty($company_id)){
|
if(empty($company_id)){
|
||||||
return $this->fail('公司信息不存在');
|
return $this->fail('公司信息不存在');
|
||||||
}
|
}
|
||||||
|
//获取当前公司类型
|
||||||
|
$currentCompany = Company::where('id',$company_id)->find();
|
||||||
|
if($currentCompany['company_type'] == 18){
|
||||||
|
$apply = VehicleVillageApply::where('village_company_id',$company_id)->find();
|
||||||
|
$car = VehicleRent::where('rent_company_id',$company_id)->find();
|
||||||
|
$data = [
|
||||||
|
'apply' => $apply->toArray(),
|
||||||
|
'car_list' => $car->toArray()
|
||||||
|
];
|
||||||
|
return $this->success('success',$data);
|
||||||
|
}
|
||||||
//获取小组服务公司申请信息
|
//获取小组服务公司申请信息
|
||||||
$apply = VehicleVillageApply::where('town_company_id',$company_id)->where('status',0)->select();
|
$apply = VehicleVillageApply::where('town_company_id',$company_id)->where('status',0)->select();
|
||||||
//获取车辆列表
|
//获取车辆列表
|
||||||
|
Loading…
x
Reference in New Issue
Block a user