1
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user