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

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

@@ -172,7 +172,19 @@ class Merchant extends BaseController
         $where['is_del'] = 0;
         $where['status'] = 1;
         $category_id && $where['category_id'] = $category_id;
-        $mer_list = Db::name('merchant')->where($where)->page($page)->limit(100)->select();
+
+        $hasProductMerIdList = Db::name('store_product')
+            ->where('status', '=', 1)
+            ->where('is_show', '=', 1)
+            ->where('is_del', '=', 0)
+            ->group('mer_id')
+            ->field('mer_id')
+            ->select();
+        if ($hasProductMerIdList) {
+            $where['mer_id'] = array_column($hasProductMerIdList->toArray(), 'mer_id');
+        }
+
+        $mer_list = Db::name('merchant')->where($where)->page($page)->limit($limit)->select();
         $where['is_gift_bag'] = 0;
         $where['is_used'] = 1;
         $where['product_type'] = 0;