diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php index 0970fcf..c67606e 100644 --- a/application/api/controller/Journal.php +++ b/application/api/controller/Journal.php @@ -690,10 +690,29 @@ class Journal extends Controller { */ public function getOnlineArticle() { $data = $this->request->post(); - $stages = $this->journal_stage_obj->where('journal_id', $data['journal_id'])->where('is_publish', 0)->where('state', 0)->column('journal_stage_id'); + $journal_info = $this->journal_obj->where('journal_id', $data['journal_id'])->find(); $limit_start = ($data['pageIndex'] - 1) * $data['pageSize']; - $list = $this->article_obj + if($journal_info['cycle']==0){ + $stage = $this->journal_stage_obj->where("journal_id",$data['journal_id'])->where("stage_year",date("Y"))->where("state",0)->find(); + $list = $this->article_obj + ->field('j_article.*,j_journal_stage.*') + ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT') + ->where("j_article.journal_id",$journal_info["journal_id"]) + ->where("j_article.lx_online",0) + ->where("j_journal_stage.journal_stage_id",$stage['journal_stage_id']) + ->limit($limit_start,$data['pageSize']) + ->select(); + $count = $this->article_obj + ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT') + ->where("j_article.journal_id",$journal_info["journal_id"]) + ->where("j_article.lx_online",0) + ->where("j_journal_stage.journal_stage_id",$stage['journal_stage_id']) + ->count(); + return json(['code' => 0, 'msg' => 'success', 'data' => ['articlelist' => strongArticleList($list), 'count' => $count]]); + }else{ + $stages = $this->journal_stage_obj->where('journal_id', $data['journal_id'])->where('is_publish', 0)->where('state', 0)->column('journal_stage_id'); + $list = $this->article_obj ->field('j_article.*,j_journal_stage.*') ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT') ->where('j_article.journal_stage_id', 'in', $stages) @@ -702,15 +721,19 @@ class Journal extends Controller { ->order('j_journal_stage.stage_year desc,j_article.sort desc') ->limit($limit_start, $data['pageSize']) ->select(); - $count = $this->article_obj + $count = $this->article_obj ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT') ->where('j_article.journal_stage_id', 'in', $stages) ->where('j_article.state', 0) ->count(); - - return json(['code' => 0, 'msg' => 'success', 'data' => ['articlelist' => strongArticleList($list), 'count' => $count]]); + return json(['code' => 0, 'msg' => 'success', 'data' => ['articlelist' => strongArticleList($list), 'count' => $count]]); + } } + + + + /** * @title 获取news文章 * @description 获取news文章