1

app/admin/model/article/Article.php

@@ -49,17 +49,17 @@ class Article extends BaseModel
         }
         if ($where['cid'] !== '')
             $model = $model->where('cid', 'in', $where['cid']);
-        else
-            if ($where['merchant'])
-                $model = $model->where('mer_id', '>', 0);
-            else
-                $model = $model->where('mer_id', 0);
+//        else
+//            if ($where['merchant'])
+//                $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');
         self::page($model, function ($item) {
-            var_dump($item);
+//            var_dump($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');
-            var_dump(114514); var_dump($item);die();
+//            var_dump(114514); var_dump($item);die();
             $item['content'] = ArticleContent::where('nid', $item['id'])->value('content');
             $item['catename'] = ArticleCategory::where('id', $item['cid'])->value('title');
             $item['store_name'] = $item->profile->store_name ?? '';