1

app/admin/controller/article/Article.php

@@ -34,7 +34,6 @@ class Article extends AuthController
         ], $this->request);
         $admin_id=$this->adminId;
         $mer_id = SystemAdmin::where('id', $admin_id)->value('mer_id');
-        var_dump($mer_id);die();
         if ($mer_id>0){
             $where['mer_id'] = $mer_id;
         }

app/admin/model/article/Article.php

@@ -51,6 +51,9 @@ class Article extends BaseModel
                 $model = $model->where('mer_id', '>', 0);
             else
                 $model = $model->where('mer_id', 0);
+            if (isset($where['mer_id'])&&$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) {
             if (!$item['mer_id']) $item['admin_name'] = '总后台管理员---》' . SystemAdmin::where('id', $item['admin_id'])->value('real_name');