From 649f6fbb8e7a7dd3b4106407b03cd913fb9c1472 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 13 Mar 2024 17:15:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/Merchant.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 5385d2f3..89d06cbc 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -47,6 +47,10 @@ class Merchant extends BaseController
         if (empty($where['type_id'])) {
             $where['type_id'] = MerchantType::where('is_allow_apply', 1)->where('is_search_display', 1)->column('mer_type_id');
         }
+        if ($where['merchant_category_id'] > 0) {
+            $where['category_id'] = $where['merchant_category_id'];
+            unset($where['merchant_category_id']);
+        }
         return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));
     }