|
|
@@ -32,11 +32,11 @@ class Article extends AuthController
|
|
|
['title', ''],
|
|
|
['cid', $this->request->param('pid', '')],
|
|
|
], $this->request);
|
|
|
-// $admin_id=$this->adminId;
|
|
|
-// $mer_id = SystemAdmin::where('id', $admin_id)->value('mer_id');
|
|
|
-// if ($mer_id>0){
|
|
|
-// $where['mer_id'] = $mer_id;
|
|
|
-// }
|
|
|
+ $admin_id=$this->adminId;
|
|
|
+ $mer_id = SystemAdmin::where('id', $admin_id)->value('mer_id');
|
|
|
+ if ($mer_id>0){
|
|
|
+ $where['mer_id'] = $mer_id;
|
|
|
+ }
|
|
|
$this->assign('where', $where);
|
|
|
$where['merchant'] = 0;//区分是管理员添加的图文显示 0 还是 商户添加的图文显示 1
|
|
|
$tree = sort_list_tier(ArticleCategoryModel::getArticleCategoryList());
|
