From d02f33f201b167d28f4a02014770415e7bc957d7 Mon Sep 17 00:00:00 2001
From: "DESKTOP-GMUNQ1B\\Administrator" <604446095@qq.com>
Date: Thu, 12 Dec 2024 14:28:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lists/store_product/StoreProductLists.php    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/app/admin/lists/store_product/StoreProductLists.php b/app/admin/lists/store_product/StoreProductLists.php
index 062022027..05f5972aa 100644
--- a/app/admin/lists/store_product/StoreProductLists.php
+++ b/app/admin/lists/store_product/StoreProductLists.php
@@ -71,7 +71,9 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
         $query = StoreProduct::where($this->searchWhere);
         if (isset($this->params['type_filter'])) {
             if ($this->params['type_filter'] == 0) {
-                $query->where('product_type', 6)->where('is_show', 0);
+                $query->where(function ($query) {
+                    $query->where('product_type', 6)->whereOr('is_show', 0);
+                });
             } else {
                 $query->where('is_show', 1);
             }
@@ -156,7 +158,17 @@ class StoreProductLists extends BaseAdminDataLists implements ListsSearchInterfa
                 }
             }
         }
-        return StoreProduct::where($this->searchWhere)->count();
+        $query = StoreProduct::where($this->searchWhere);
+        if (isset($this->params['type_filter'])) {
+            if ($this->params['type_filter'] == 0) {
+                $query->where(function ($query) {
+                    $query->where('product_type', 6)->whereOr('is_show', 0);
+                });
+            } else {
+                $query->where('is_show', 1);
+            }
+        }
+        return $query->count();
     }
 
     /**