From 89b5a9eb81838e1432db00210a9426ccc401399e Mon Sep 17 00:00:00 2001
From: unknown <736250432@qq.com>
Date: Sat, 2 Sep 2023 09:15:20 +0800
Subject: [PATCH] update

---
 app/adminapi/lists/vehicle/VehicleLists.php | 2 +-
 app/common/model/vehicle/Vehicle.php        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/lists/vehicle/VehicleLists.php b/app/adminapi/lists/vehicle/VehicleLists.php
index 3330fb8a..d3cd7726 100644
--- a/app/adminapi/lists/vehicle/VehicleLists.php
+++ b/app/adminapi/lists/vehicle/VehicleLists.php
@@ -44,7 +44,7 @@ class VehicleLists extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function lists(): array
     {
-        return Vehicle::where($this->searchWhere)
+        return Vehicle::where($this->searchWhere)->where('status','<>',3)
             ->field(['id','license', 'gps_imei', 'status','type'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
diff --git a/app/common/model/vehicle/Vehicle.php b/app/common/model/vehicle/Vehicle.php
index f8828cd8..1a565040 100644
--- a/app/common/model/vehicle/Vehicle.php
+++ b/app/common/model/vehicle/Vehicle.php
@@ -15,7 +15,7 @@ class Vehicle  extends BaseModel
 
     public function getStatusNameAttr($value,$data): string
     {
-        $status = [0=>'未出租',1=>'签约中',2=>'已出租'];
+        $status = [0=>'未出租',1=>'签约中',2=>'已出租',3=>'已解约'];
         return $status[$data['status']];
     }