From d34934126926c1de9f78dc8e821484ce8afb7649 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 27 Jun 2024 10:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=BC=E5=AE=B9=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lists/store_branch_product/StoreBranchProductLists.php   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/admin/lists/store_branch_product/StoreBranchProductLists.php b/app/admin/lists/store_branch_product/StoreBranchProductLists.php
index 02f6df20d..c4ced3bf6 100644
--- a/app/admin/lists/store_branch_product/StoreBranchProductLists.php
+++ b/app/admin/lists/store_branch_product/StoreBranchProductLists.php
@@ -61,7 +61,9 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI
             //2或者1
             $where[]=['cate_id','=',$class_all];
         }
-        $this->searchWhere[]=$where;
+        if($where){
+            $this->searchWhere[]=$where;
+        }
         return StoreBranchProduct::where($this->searchWhere)
             ->field(['id','store_id','product_id', 'image', 'store_name', 'cate_id', 'price', 'sales', 'stock', 'unit', 'cost','purchase', 'status','batch','vip_price','manufacturer_information'])
             ->when(!empty($this->adminInfo['store_id']), function ($query) {
@@ -99,6 +101,7 @@ class StoreBranchProductLists extends BaseAdminDataLists implements ListsSearchI
      */
     public function count(): int
     {
+        $status = $this->params['status'] ?? '';
         return StoreBranchProduct::where($this->searchWhere)
             ->when(!empty($this->adminInfo['store_id']), function ($query) {
                 $query->where('store_id', $this->adminInfo['store_id']);