From 6fc66e83c236041a00221f1b6837dbf6177567c2 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 6 Feb 2024 18:25:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AA=E5=95=86=E6=88=B7=E6=97=B6=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=95=86=E6=88=B7=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/system/merchant/MerchantDao.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/common/dao/system/merchant/MerchantDao.php b/app/common/dao/system/merchant/MerchantDao.php
index 1830678..8b97fa7 100644
--- a/app/common/dao/system/merchant/MerchantDao.php
+++ b/app/common/dao/system/merchant/MerchantDao.php
@@ -41,7 +41,11 @@ class MerchantDao extends BaseDao
         $merchantType = in_array((int)$merchantType,[0,1,2]) ? $merchantType : 0;// 类型非法，使用默认类型
 
         $query = Merchant::getDB()
-            ->where('merchant_type', $merchantType)
+            ->when(isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) {
+                $query->where('mer_id', $where['mer_id']);
+            },function($query) use ($merchantType){
+                $query->where('merchant_type', $merchantType);
+            })
             ->when($is_del !== null, function ($query) use ($is_del) {
                 $query->where('is_del', $is_del);
             })
@@ -75,9 +79,9 @@ class MerchantDao extends BaseDao
             ->when(isset($where['mer_id']) && $where['mer_id'] !== '', function ($query) use ($where) {
                 $query->where('mer_id', $where['mer_id']);
             })
-            ->when(isset($where['mer_id_list']) && $where['mer_id_list'] !== '', function ($query) use ($where) {
-                $query->whereIn('mer_id', $where['mer_id_list']);
-            })
+            // ->when(isset($where['mer_id_list']) && $where['mer_id_list'] !== '', function ($query) use ($where) {
+            //     $query->whereIn('mer_id', $where['mer_id_list']);
+            // })
             ->when(isset($where['category_id']) && $where['category_id'] !== '', function ($query) use ($where) {
                 $query->whereIn('category_id', is_array($where['category_id']) ? $where['category_id'] : explode(',', $where['category_id']));
             })