From 04a155c98ce7d9b79cdf7491acba6f6adb070cef Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Thu, 12 Oct 2023 17:53:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=85=AC=E5=8F=B8=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/VehicleController.php | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index ed04aa748..05bce77d7 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -426,24 +426,17 @@ class VehicleController extends BaseApiController
 
     //车辆详情
     public function vehicleInfo() {
-        //获取参数
-        $carId = $this->request->get('car_id');
-        if(empty($carId)){
-            return $this->fail('缺少必要参数');
-        }
         //获取数据
-        $data = VehicleRent::where('car_id',$carId)->find();
-        if(empty($data)){
-            return $this->fail('数据错误');
+        $data = VehicleRent::where('rent_company_id',$this->userInfo['company_id'])->where('status',2)->findOrEmpty();
+        if($data->isEmpty()){
+            return $this->fail('数据不存在');
         }
         $data['mileage'] = 0;
-        if($data['status'] == 2){
-            $data['company'] =  Company::field('company_name,master_name as user_name,master_phone as user_phone,province,city,area,street,village,brigade')->where('id',$data['rent_company_id'])->find()->append(['province_name', 'city_name', 'area_name', 'street_name', 'village_name','brigade_name']);
-            //获取合同
-            $data['contract'] = VehicleContract::field('id,contract_no,contract_url,file,status,create_time,update_time')->where('id',$data['contract_id'])->findOrEmpty();
-        }
+        $data['company'] =  Company::field('company_name,master_name as user_name,master_phone as user_phone,province,city,area,street,village,brigade')->where('id',$data['rent_company_id'])->find()->append(['province_name', 'city_name', 'area_name', 'street_name', 'village_name','brigade_name']);
+        //获取合同
+        $data['contract'] = VehicleContract::field('id,contract_no,contract_url,file,status,create_time,update_time')->where('id',$data['contract_id'])->findOrEmpty();
         //当前坐标位置
-        $position = curl_get(env('project.logistic_domain').'/api/getCarLocal?car_id='.$carId);
+        $position = curl_get(env('project.logistic_domain').'/api/getCarLocal?car_id='.$data['car_id']);
         if($position && $position['code'] == 1){
             $data['position'] = $position['data'];
         }else{