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); }