From ef00bf8a0c5de3477984e466ca856465ccf5b06b Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Thu, 31 Aug 2023 17:58:49 +0800
Subject: [PATCH 1/3] update

---
 .../controller/contract/VehicleContractController.php     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/controller/contract/VehicleContractController.php b/app/adminapi/controller/contract/VehicleContractController.php
index 3419ed0fc..6613140a0 100644
--- a/app/adminapi/controller/contract/VehicleContractController.php
+++ b/app/adminapi/controller/contract/VehicleContractController.php
@@ -78,12 +78,14 @@ class VehicleContractController extends BaseAdminController
         if(isset($param['contract_no'])){
             $where[] = ['contract_no','like','%'.$param['contract_no'].'%'];
         }
-        if(isset($param['status'])){
-            $where[] = ['status','=', $param['contract_no']];
+        if(isset($param['status']) && in_array($param['status'],[0,1])){
+            $where[] = ['status','=', $param['status']];
+        }else{
+            $where[] = ['status','in', '0,1'];
         }
         $pageNo = !empty($param['page_no']) ? $param['page_no'] : 1;
         $pageSize = !empty($param['page_size']) ? $param['page_size'] : 15;
-        $data = VehicleContract::where($where)->where('status','in','0,1')
+        $data = VehicleContract::where($where)
             ->page($pageNo, $pageSize)
             ->order('create_time desc')
             ->select()->each(function($item){

From b29ee995e061a76610c7618d70f82bdeac15dfe0 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Thu, 31 Aug 2023 18:04:48 +0800
Subject: [PATCH 2/3] update

---
 app/api/controller/VehicleController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 39b9261b7..e6620922b 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -298,7 +298,7 @@ class VehicleController extends BaseApiController
             return $this->fail('非镇街公司不能访问');
         }
         //获取小组服务公司申请信息
-        $vehicleContract = VehicleContract::where('company_a_id',$company['id'])->where('status',-1)->limit(2)->order('create_time desc')->select()->toArray();
+        $vehicleContract = VehicleContract::where('company_a_id',$company['id'])->where('status','in','-1,0,1,2')->limit(2)->order('create_time desc')->select()->toArray();
         //获取车辆列表
         $vehicleRentCars = VehicleRent::where('company_id',$company['id'])->select()->each(function($item){
             if($item['status'] == 2){

From cc81b9cb4bb739aa0b23bf3880583d89c1d43fa8 Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Thu, 31 Aug 2023 18:10:52 +0800
Subject: [PATCH 3/3] update

---
 app/api/controller/VehicleController.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index e6620922b..cc5eca80f 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -271,15 +271,7 @@ class VehicleController extends BaseApiController
         if($vehicleContract['company_a_id'] != $this->userInfo['company_id']){
             return $this->fail('数据不匹配');
         }
-        if(!empty($vehicleContract['cars_info'])){
-            $vehicleContract['cars_info'] = json_decode($vehicleContract['cars_info'],true);
-        }
-        //判断申请状态
-        if($vehicleContract['status'] == -1){
-            $vehicleRentCars = VehicleRent::where('company_id',$vehicleContract['company_a_id'])->where('status',0)->select()->toArray();
-        }else{
-            $vehicleRentCars = [];
-        }
+        $vehicleRentCars = VehicleRent::where('company_id',$vehicleContract['company_a_id'])->select()->toArray();
         $data = [
             'vehicleContract' => $vehicleContract->toArray(),
             'vehicleRentCars' => $vehicleRentCars