From 70463539c303307046f4c3355367a92aa5b6f188 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 5 Feb 2024 17:47:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=99=84=E8=BF=91?=
 =?UTF-8?q?=E5=95=86=E5=AE=B6=E6=94=AF=E6=8C=81=E6=98=BE=E7=A4=BA=E6=8C=87?=
 =?UTF-8?q?=E5=AE=9A=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/system/merchant/MerchantDao.php | 2 +-
 app/controller/api/store/merchant/Merchant.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/common/dao/system/merchant/MerchantDao.php b/app/common/dao/system/merchant/MerchantDao.php
index 4b0db25..1830678 100644
--- a/app/common/dao/system/merchant/MerchantDao.php
+++ b/app/common/dao/system/merchant/MerchantDao.php
@@ -38,7 +38,7 @@ class MerchantDao extends BaseDao
     public function search(array $where, $is_del = 0)
     {
         $merchantType = $where['merchant_type'] ?? 0;
-        $merchantType = in_array((int)$merchantType,[1,2,3]) ? $merchantType : 0;// 类型非法，使用默认类型
+        $merchantType = in_array((int)$merchantType,[0,1,2]) ? $merchantType : 0;// 类型非法，使用默认类型
 
         $query = Merchant::getDB()
             ->where('merchant_type', $merchantType)
diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 1fc5c7b..940669f 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -35,7 +35,7 @@ class Merchant extends BaseController
     public function lst()
     {
         [$page, $limit] = $this->getPage();
-        $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader']);
+        $where = $this->request->params(['keyword', 'order', 'is_best', 'location', 'category_id', 'type_id','is_trader','merchant_type']);
         return app('json')->success($this->repository->getList($where, $page, $limit, $this->userInfo));
     }
     /**