From ca2ecf41fcff934bf6705bb5ccfde508a0377720 Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Mon, 9 Jun 2025 14:40:28 +0800
Subject: [PATCH] 1

---
 app/controller/VehicleController.php | 33 +++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 6 deletions(-)

diff --git a/app/controller/VehicleController.php b/app/controller/VehicleController.php
index 6c86f15..e43fceb 100644
--- a/app/controller/VehicleController.php
+++ b/app/controller/VehicleController.php
@@ -50,7 +50,7 @@ class VehicleController
     {
         
         $lang = $request->post('lang', 'zh');
-        $status = $request->post('status', '4');
+        $status = $request->post('status', '');
         // 接收请求参数（Webman自动注入）
         $page =  $request->post('page', 1);      // 默认第1页
         $pageSize = $request->post('pageSize', 30); // 默认每页30条
@@ -70,22 +70,38 @@ class VehicleController
 
         switch ($lang) {
             case 'zh':
-                $vehicles = Vehicle::with('location')->with('finalLocation')->where($where)->whereIn('status',$status)->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
+                $vehicles = Vehicle::with('location')->with('finalLocation')->where($where);
+                if(!empty($status)){
+                    $vehicles = $vehicles->whereIn('status',$status);
+                }
+                $vehicles = $vehicles->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
                 $hz = new Location();
             break;
 
             case 'en':
-                $vehicles = VehicleEn::with('location')->with('finalLocation')->where($where)->whereIn('status',$status)->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
+                $vehicles = VehicleEn::with('location')->with('finalLocation')->where($where);
+                if(!empty($status)){
+                    $vehicles = $vehicles->whereIn('status',$status);
+                }
+                $vehicles = $vehicles->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
                 $hz = new LocationEn();
             break;
 
             case 'ru':
-                $vehicles = VehicleRu::with('location')->with('finalLocation')->where($where)->whereIn('status',$status)->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
+                $vehicles = VehicleRu::with('location')->with('finalLocation')->where($where);
+                if(!empty($status)){
+                    $vehicles = $vehicles->whereIn('status',$status);
+                }
+                $vehicles = $vehicles->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
                 $hz = new LocationRu();
             break;
 
             case 'ar':
-                $vehicles = VehicleAr::with('location')->with('finalLocation')->where($where)->whereIn('status',$status)->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
+                $vehicles = VehicleAr::with('location')->with('finalLocation')->where($where);
+                if(!empty($status)){
+                    $vehicles = $vehicles->whereIn('status',$status);
+                }
+                $vehicles = $vehicles->offset(($page-1)*$pageSize) ->limit($pageSize)->get();
                 $hz = new LocationAr();
             break;
         }
@@ -154,7 +170,12 @@ class VehicleController
         }
         unset($vehicle);
         // =================================== new ===================================== end
-        $count = Vehicle::where($where)->whereIn('status',$status)->count();
+
+        if(!empty($status)){
+            $count = Vehicle::where($where)->whereIn('status',$status)->count();
+        } else {
+            $count = Vehicle::where($where)->count();
+        }
         $result = ['list' => $vehicles,'count'=>$count];
         return Util::success($result);
     }