From 604c6ff79962e474a54e00d8ccae794a6a9ddc86 Mon Sep 17 00:00:00 2001
From: "LAPTOP-7SGDREK0\\shiweijun" <411582373@qq.com>
Date: Thu, 27 Feb 2025 16:55:58 +0800
Subject: [PATCH] fix:material_category

---
 app/Request/Admin/MaterialCategoryRequest.php          | 1 +
 app/Service/Admin/Material/MaterialCategoryService.php | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/app/Request/Admin/MaterialCategoryRequest.php b/app/Request/Admin/MaterialCategoryRequest.php
index 6fa0414..2d77fd8 100644
--- a/app/Request/Admin/MaterialCategoryRequest.php
+++ b/app/Request/Admin/MaterialCategoryRequest.php
@@ -37,5 +37,6 @@ class MaterialCategoryRequest extends FormRequest
         'add' => ['name', 'parent_id', 'city_id', 'kitchen_id'],
         'edit' => ['id','name', 'parent_id'],
         'delete' => ['id'],
+        'list' => ['query_city_id'],
     ];
 }
diff --git a/app/Service/Admin/Material/MaterialCategoryService.php b/app/Service/Admin/Material/MaterialCategoryService.php
index c64ebb4..9ecdfb6 100644
--- a/app/Service/Admin/Material/MaterialCategoryService.php
+++ b/app/Service/Admin/Material/MaterialCategoryService.php
@@ -105,7 +105,12 @@ class MaterialCategoryService extends BaseService{
      */
     public function list(): array
     {
+        $cityId = (int)$this->request->input('query_city_id');
+
         $list = $this->MaterialCategoryModel
+            ->when($cityId > 0,function($query) use($cityId){
+                $query->where('city_id',$cityId);
+            })
             ->where('is_del',MaterialCode::IS_NO_DEL)->get();
 
         return $this->return->success('success',['list' => $list->toArray()]);