1

app/admin/model/article/Article.php

@@ -44,6 +44,9 @@ class Article extends BaseModel
 //        if($where['status'] !== '') $model = $model->where('status',$where['status']);
 //        if($where['access'] !== '') $model = $model->where('access',$where['access']);
         if ($where['title'] !== '') $model = $model->where('title', 'LIKE', "%$where[title]%");
+        if (isset($where['mer_id'])&&$where['mer_id']!== ''){
+            $model = $model->where('mer_id', $where['mer_id']);
+        }
         if ($where['cid'] !== '')
             $model = $model->where('cid', 'in', $where['cid']);
         else
@@ -51,11 +54,7 @@ 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');
-            var_dump($model->getLastSql());die();
         return self::page($model, function ($item) {
             if (!$item['mer_id']) $item['admin_name'] = '总后台管理员---》' . SystemAdmin::where('id', $item['admin_id'])->value('real_name');
             else $item['admin_name'] = Merchant::where('id', $item['mer_id'])->value('mer_name') . '---》' . MerchantAdmin::where('id', $item['admin_id'])->value('real_name');