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

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

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

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

@ -334,6 +334,7 @@ class VehicleController extends BaseApiController
if(empty($vehicleContract)){ if(empty($vehicleContract)){
return $this->success('没有数据，请申请'); return $this->success('没有数据，请申请');
} }
if($vehicleContract['status'] == 3){
if(!empty($vehicleContract['cars_info'])){ if(!empty($vehicleContract['cars_info'])){
$vehicleContract['cars_info'] = json_decode($vehicleContract['cars_info'],true); $vehicleContract['cars_info'] = json_decode($vehicleContract['cars_info'],true);
if(!empty($vehicleContract['cars_info'])){ if(!empty($vehicleContract['cars_info'])){
@ -353,6 +354,7 @@ class VehicleController extends BaseApiController
$vehicleContract['street'] = $company['street_name']; $vehicleContract['street'] = $company['street_name'];
$vehicleContract['village'] = $company['village_name']; $vehicleContract['village'] = $company['village_name'];
$vehicleContract['brigade'] = $company['brigade_name']; $vehicleContract['brigade'] = $company['brigade_name'];
}
//返回数据 //返回数据
return $this->success('请求成功',$vehicleContract->toArray()); return $this->success('请求成功',$vehicleContract->toArray());
} }