From 665f46eb14cc626df96c64b89efb13d0697a5b0e Mon Sep 17 00:00:00 2001
From: "HESU\\HESU" <1696136552@qq.com>
Date: Fri, 30 May 2025 15:35:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=93=81=E7=89=8C=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/console/controller/BrandController.php      |  8 +++++++-
 app/console/controller/VehicleNewController.php | 11 ++++++++++-
 app/console/service/BrandService.php            |  4 +---
 app/console/service/VehicleNewService.php       |  4 +---
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/console/controller/BrandController.php b/app/console/controller/BrandController.php
index d246cff..d0bd426 100644
--- a/app/console/controller/BrandController.php
+++ b/app/console/controller/BrandController.php
@@ -107,7 +107,13 @@ class BrandController extends BaseController
         $params = parent::prepareParams($request, $scene);
 
         if ($scene === 'default') {
-            
+            $params['filters'] = [];
+            if(!empty($params['name'])){
+                $params['filters'][] = ['field' => 'name', 'operator' => 'like', 'value' => '%'.$params['name'].'%'];
+            }
+            if($params['status'] != ''){
+                $params['filters'][] = ['field' => 'status', 'operator' => '=', 'value' => $params['status']];
+            }
         }
         
         return $params;
diff --git a/app/console/controller/VehicleNewController.php b/app/console/controller/VehicleNewController.php
index bcaecd5..6c57db6 100644
--- a/app/console/controller/VehicleNewController.php
+++ b/app/console/controller/VehicleNewController.php
@@ -120,7 +120,16 @@ class VehicleNewController extends BaseController
         $params = parent::prepareParams($request, $scene);
 
         if ($scene === 'default') {
-            
+            $params['filters'] = [];
+            if(!empty($params['brand'])){
+                $params['filters'][] = ['field' => 'brand', 'operator' => '=', 'value' => $params['brand']];
+            }
+            if(!empty($params['type'])){
+                $params['filters'][] = ['field' => 'type', 'operator' => '=', 'value' => $params['type']];
+            }
+            if(!empty($params['energy'])){
+                $params['filters'][] = ['field' => 'energy', 'operator' => '=', 'value' => $params['energy']];
+            }
         }
         
         return $params;
diff --git a/app/console/service/BrandService.php b/app/console/service/BrandService.php
index 494c434..6b6ce33 100644
--- a/app/console/service/BrandService.php
+++ b/app/console/service/BrandService.php
@@ -32,9 +32,7 @@ class BrandService extends BaseService
         return [
             'default' => function ($params) {
                 return [
-                    'filters' => [
-                        ['field' => 'status', 'operator' => '=', 'value' => '1']
-                    ],
+                    'filters' =>  $params['filters'],
                     'fields' => ['id', 'status', 'sort', 'toppic', 'descpic', 'logo', 'letter', 'is_hot', 'created_at', 'updated_at'],
                     'relations'     => [
                         'translation' => ['brand_id', 'name', 'desc','toppic_alt','descpic_alt','logo_alt'],
diff --git a/app/console/service/VehicleNewService.php b/app/console/service/VehicleNewService.php
index 9ea6dff..de76ab2 100644
--- a/app/console/service/VehicleNewService.php
+++ b/app/console/service/VehicleNewService.php
@@ -35,9 +35,7 @@ class VehicleNewService extends BaseService
             'default' => function ($params) {
                 $keyword = $params['keyword'] ?? '';
                 return [
-                    'filters' => [
-//                         ['field' => '***', 'operator' => '=', 'value' => '***']
-                    ],
+                    'filters' => $params['filters'],
                     'fields' => ['id', 'vin', 'brand', 'cover', 'price', 'type', 'energy', 'model', 'video', 'views', 'created_at', 'updated_at'],
                     'relations' => [
                         'translation' => ['vehicle_id', 'locale', 'name', 'condition_desc', 'location'],