diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php index 70f5790..28e4ed1 100644 --- a/application/api/controller/Article.php +++ b/application/api/controller/Article.php @@ -486,13 +486,23 @@ class Article extends Controller { if(($journal_info['journal_id']==2&&$stage_info['journal_stage_id']>=337)||($journal_info['journal_id']==17&&$stage_info['journal_stage_id']>=346)||($journal_info['journal_id']==18&&$stage_info['journal_stage_id']>=338)){ $order = "j_article.sort desc"; } - $list = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title') + $query = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title') ->join("j_journal", 'j_journal.journal_id = j_article.journal_id', 'left') ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT') ->where('j_article.journal_stage_id', $data['stage_id']) - ->where('j_article.state', 0) - ->order($order) + ->where('j_article.state', 0); + if($journal_info['cycle']==0){ + $query->where("j_article.lx_online",1); + } + $list = $query->order($order) ->select(); +// $list = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title') +// ->join("j_journal", 'j_journal.journal_id = j_article.journal_id', 'left') +// ->join('j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT') +// ->where('j_article.journal_stage_id', $data['stage_id']) +// ->where('j_article.state', 0) +// ->order($order) +// ->select(); $l = strongArticleList(choiseJtitle($list)); $re['stageInfo'] = $stage_info; $re['articleList'] = $l; diff --git a/application/api/controller/Main.php b/application/api/controller/Main.php index f3326f5..d1bc5a1 100644 --- a/application/api/controller/Main.php +++ b/application/api/controller/Main.php @@ -168,11 +168,11 @@ class Main extends Controller { public function getMainArticles(){ $list_tmr = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',1)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select(); // $list_zh = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',25)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select(); - $list_zh = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',25)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.journal_stage_id desc,j_article.article_id desc')->limit(1)->select();//新增排序j_article.journal_stage_id desc,20260210 - $list_life = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',11)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select(); - $list_fyw = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',14)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select(); + $list_zh = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',25)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.journal_stage_id desc,j_article.sort asc')->limit(1)->select();//新增排序j_article.journal_stage_id desc,20260210 + $list_life = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',11)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.journal_stage_id desc,j_article.sort asc')->limit(1)->select(); + $list_fyw = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',14)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.journal_stage_id desc,j_article.sort asc')->limit(1)->select(); $list_ywlh = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',2)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select(); - $list_zy = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',4)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select(); + $list_zy = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',4)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.journal_stage_id desc,j_article.sort asc')->limit(1)->select(); $list_zy1 = $this->article_obj->field('j_article.*,j_journal_stage.*,j_journal.title journal_title,j_journal.jabbr journal_short,j_journal.usx usx')->join(array(['j_journal_stage', 'j_article.journal_stage_id = j_journal_stage.journal_stage_id', 'LEFT'],['j_journal','j_article.journal_id = j_journal.journal_id','LEFT']))->where('j_article.journal_id',8)->where('j_journal_stage.is_publish',1)->where('j_article.state',0)->order('j_article.article_id desc')->limit(1)->select(); $list = $list_tmr; $list[] = $list_zh[0];