1

app/admin/model/article/Article.php

@@ -54,7 +54,10 @@ class Article extends BaseModel
 //                $model = $model->where('mer_id', '>', 0);
 //            else
 //                $model = $model->where('mer_id', 0);
-        $model = $model->where('status', 1)->where('hide', 0)->where('mer_id',$where['mer_id'])->order('id desc');
+        if (!empty($where['mer_id'])){
+            $model = $model->where('mer_id',$where['mer_id']);
+        }
+        $model = $model->where('status', 1)->where('hide', 0)->order('id desc');
         return self::page($model, function ($item) {
 //            var_dump($item);
 //            if (!$item['mer_id'])