From eaa8b601c4217299bb1c34e7d7808e2030f246f1 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Thu, 24 Aug 2023 15:47:33 +0800
Subject: [PATCH] a

---
 app/api/controller/VehicleController.php | 4 ++--
 app/api/logic/VehicleLogic.php           | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 09d97604..27b2ad7f 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -102,8 +102,8 @@ class VehicleController extends BaseApiController
 
     //获取车辆当前位置
     public function getCarLocal():Json {
-        $params = $this->request->get(['car_id','gps_imei']);
-        if(empty($params['car_id']) || empty($params['gps_imei'])){
+        $params = $this->request->get(['car_id']);
+        if(empty($params['car_id'])){
             return $this->fail('缺少必要参数');
         }
         $result = VehicleLogic::getCarLocal($params);
diff --git a/app/api/logic/VehicleLogic.php b/app/api/logic/VehicleLogic.php
index 307ca184..f9e3d99e 100644
--- a/app/api/logic/VehicleLogic.php
+++ b/app/api/logic/VehicleLogic.php
@@ -206,8 +206,7 @@ class VehicleLogic extends BaseLogic
     public static function getCompanyCars($params):array {
         $company_str = $params['company_type'] == 1 ? 'lessee_one_company_id' : 'lessee_two_company_id';
         $data = VehicleRent::where($company_str,$params['company_id'])->select()->each(function($item){
-            $car = Vehicle::field('license,gps_imei')->where('id',$item['car_id'])->find();
-            $item['gps_imei'] = $car['gps_imei'];
+            $car = Vehicle::field('license')->where('id',$item['car_id'])->find();
             $item['license'] = $car['license'];
             return $item;
         });
@@ -219,7 +218,7 @@ class VehicleLogic extends BaseLogic
     }
 
     public static function getCarLocal($params):array {
-        $car = Vehicle::field('gps_carid')->where('id',$params['car_id'])->where('gps_imei',$params['gps_imei'])->find();
+        $car = Vehicle::field('gps_carid')->where('id',$params['car_id'])->find();
         if(!$car){
             return ['code'=>0,'msg'=>'车辆不存在'];
         }