diff --git a/app/api/controller/Article.php b/app/api/controller/Article.php index dc3f97f..ae7f590 100644 --- a/app/api/controller/Article.php +++ b/app/api/controller/Article.php @@ -753,7 +753,7 @@ class Article extends BaseController $select = Db::table('fa_article')->where($where)->page($page)->limit(20) ->alias('a') ->join(['fa_article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time >=".date('Y-m-d')) - ->field('a.id,a.title,a.describe,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time') + ->field('a.id,a.title,a.describe,a.source,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time') ->order('a.id DESC') ->select()->toArray(); }else if ($screen==3){ @@ -764,7 +764,7 @@ class Article extends BaseController $select = Db::table('fa_article')->where($where)->page($page)->limit(20) ->alias('a') ->join(['fa_article_vote_side_tables' => 'avst'],"a.id = avst.article_id and avst.end_time <=".date('Y-m-d')) - ->field('a.id,a.title,a.describe,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time') + ->field('a.id,a.title,a.describe,a.source,a.user_id,a.view,a.view_time,a.image,a.end_time,a.is_solve,a.is_vote,a.is_nickname,a.video,a.category_type,avst.end_time as die_time') ->order('a.id DESC')->select()->toArray(); }else{ //查询是否解决 @@ -774,7 +774,7 @@ class Article extends BaseController $where[] = ['is_solve', '=', 1]; } $select = Db::table('fa_article')->with('user')->where($where)->page($page)->limit(20) - ->field('id,title,user_id,view,view_time,image,end_time,is_solve,is_vote,is_nickname,video,category_type,describe') + ->field('id,title,user_id,view,source,view_time,image,end_time,is_solve,is_vote,is_nickname,video,category_type,describe') ->order('id',$orders)->select()->toArray(); } @@ -784,7 +784,11 @@ class Article extends BaseController $select[$key]['avatar'] = ""; $select[$key]['user_id'] = 0; } else { - $select[$key]['nickname'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $value['user_id'])->value('name'); + if ($value['user_id']==1){ + $select[$key]['nickname']=$value['source']; + }else{ + $select[$key]['nickname'] = Db::table('fa_szxc_information_usermsg')->where('user_id', $value['user_id'])->value('name'); + } } //投票处理 if ($value['is_vote'] == 1) {