From bd0958cbe3546ebe9e9b34cfc34e35c1dffe5571 Mon Sep 17 00:00:00 2001
From: wangxiaowei <wang199765>
Date: Wed, 18 Dec 2024 10:22:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/GoodsLogic.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/api/logic/GoodsLogic.php b/app/api/logic/GoodsLogic.php
index c1dc3bb7..f750e08f 100755
--- a/app/api/logic/GoodsLogic.php
+++ b/app/api/logic/GoodsLogic.php
@@ -545,7 +545,6 @@ class GoodsLogic extends Logic
                         [$con[$v['level']], 'like', '%' . $v['id'] . '%'],
                     ])
                     ->order($order)
-                    ->page($get['page_no'], $get['page_size'])
                     ->select();
             }
         } else {
@@ -624,7 +623,14 @@ class GoodsLogic extends Logic
             }
         }
 
-        $count = Goods::where($where)->where($wh)->count();
+        if (!empty($cate)) {
+            $list = Goods::where($where)
+                ->where([
+                    [$con[$v['level']], 'like', '%' . $v['id'] . '%'],
+                ])->count();
+        } else {
+            $count = Goods::where($where)->where($wh)->count();
+        }
 
         $list = $list ? $list->toArray() : [];