|
|
@@ -54,7 +54,7 @@ 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)->order('id desc');
|
|
|
+ $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');
|