From e2641be239c6aae5e84f275190ab8a394a52c2c2 Mon Sep 17 00:00:00 2001
From: shengchanzhe <179998674@qq.com>
Date: Mon, 25 Dec 2023 17:24:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/merchant/store/product/ProductLabel.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/controller/merchant/store/product/ProductLabel.php b/app/controller/merchant/store/product/ProductLabel.php
index 56dca928..4aa28e59 100644
--- a/app/controller/merchant/store/product/ProductLabel.php
+++ b/app/controller/merchant/store/product/ProductLabel.php
@@ -30,7 +30,9 @@ class ProductLabel extends BaseController
     {
         [$page, $limit] = $this->getPage();
         $where = $this->request->params(['name', 'type', 'status']);
-        $where['mer_id'] = $this->request->merId();
+        if($where['type']!=1){
+            $where['mer_id'] = $this->request->merId();
+        }
         $data  = $this->repository->getList($where,$page, $limit);
         return app('json')->success($data);
     }