小程序app-商贸区-检测问题

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

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