1

app/admin/model/article/Article.php

@@ -57,8 +57,9 @@ class Article extends BaseModel
         $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);
-            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');
+//            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();
             $item['content'] = ArticleContent::where('nid', $item['id'])->value('content');
             $item['catename'] = ArticleCategory::where('id', $item['cid'])->value('title');