客户端-暂时修复商贸区翻页问题

app/controller/api/store/merchant/Merchant.php

@@ -181,10 +181,13 @@ class Merchant extends BaseController
             ->field('mer_id')
             ->select();
         if ($hasProductMerIdList) {
-            $where['mer_id'] = array_column($hasProductMerIdList->toArray(), 'mer_id');
+            $hasProductMerIdList = array_column($hasProductMerIdList->toArray(), 'mer_id');
         }
-
-        $mer_list = Db::name('merchant')->where($where)->page($page)->limit($limit)->select();
+        $query = Db::name('merchant')->where($where);
+        if (!empty($hasProductMerIdList) && is_array($hasProductMerIdList)) {
+            $query->whereIn('mer_id', $hasProductMerIdList);
+        }
+        $mer_list = $query->page($page)->limit($limit)->select();
         $where['is_gift_bag'] = 0;
         $where['is_used'] = 1;
         $where['product_type'] = 0;