From 44b26d517c49515d4e01e96a2ec52f29f8c96770 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Mon, 4 Dec 2023 16:01:22 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/store/merchant/Merchant.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php index f0ceb9cf..d1a176ba 100644 --- a/app/controller/api/store/merchant/Merchant.php +++ b/app/controller/api/store/merchant/Merchant.php @@ -62,17 +62,17 @@ class Merchant extends BaseController if (empty($where['type_id'])) { $where['type_id'] =[10,17]; } - // if($where['store_category_id']>0){ - // $arr= Db::name('store_category')->where(['pid'=>$where['store_category_id'],'mer_id'=>0,'level'=>1,'is_show'=>1])->column('cate_name'); - // if($arr){ - // $category_id=Db::name('merchant_category')->whereIn('category_name',$arr)->column('merchant_category_id'); - // if($category_id){ - // $where['category_id']=implode(',',$category_id); - // } - // } - // unset($where['store_category_id']); - // } - $where['category_id']=$where['store_category_id']??''; + if($where['store_category_id']>0){ + $arr= Db::name('store_category')->where(['pid'=>$where['store_category_id'],'mer_id'=>0,'level'=>1,'is_show'=>1])->column('cate_name'); + if($arr){ + $category_id=Db::name('merchant_category')->whereIn('category_name',$arr)->column('merchant_category_id'); + if($category_id){ + $where['category_id']=implode(',',$category_id); + } + } + unset($where['store_category_id']); + } + // $where['category_id']=$where['store_category_id']??''; return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo)); }