From 2af945ac0eaa63589438521bdef78d1a682b50ec Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Fri, 8 Sep 2023 17:43:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=BB=84=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=85=AC=E5=8F=B8=E7=94=B3=E8=AF=B7=E7=94=A8=E8=BD=A6?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E5=92=8C=E5=8F=96=E6=B6=88=E7=AD=BE=E7=BA=A6?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/IndexController.php   | 2 +-
 app/api/controller/VehicleController.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/api/controller/IndexController.php b/app/api/controller/IndexController.php
index f72154ac4..1fc38031a 100755
--- a/app/api/controller/IndexController.php
+++ b/app/api/controller/IndexController.php
@@ -335,7 +335,7 @@ class IndexController extends BaseApiController
             //获取租赁车辆信息
             $vehicleRentInfo = VehicleRent::where('car_id', $vehicle['id'])->find();
             //更新原始合同类型
-            VehicleContract::where('id', $vehicleRentInfo['contract_id'])->update(['type' => 2]);
+            VehicleContract::where('id', $vehicleRentInfo['contract_id'])->update(['status' => 6]);
             VehicleRent::where('car_id', $vehicle['id'])->update([
                 'status' => 3,
             ]);
diff --git a/app/api/controller/VehicleController.php b/app/api/controller/VehicleController.php
index 471c8f776..2c6bdc2e9 100644
--- a/app/api/controller/VehicleController.php
+++ b/app/api/controller/VehicleController.php
@@ -237,7 +237,7 @@ class VehicleController extends BaseApiController
             return $this->fail('当前镇街公司未签约');
         }
         //判断是否申请过
-        $vehicleContract = VehicleContract::where('company_b_id',$this->userInfo['company_id'])->where('type','<>',2)->where('status','<>',4)->find();
+        $vehicleContract = VehicleContract::where('company_b_id',$this->userInfo['company_id'])->where('type','<>',2)->whereNotIn('status','4,5,6')->find();
         if(!empty($vehicleContract)){
             return $this->fail('请勿重复申请');
         }