20201112

2021-02-22 16:56:45 +08:00
parent c6e41c6035
commit 846b42ba83
5 changed files with 278 additions and 8 deletions
--- a/application/api/controller/Journal.php
+++ b/application/api/controller/Journal.php
@@ -369,8 +369,9 @@ class Journal extends Controller {
                ->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)
+                ->where('j_journal_stage.stage_year','>','2018')
                ->where('j_article.type', ['like', 'News'], ['like', 'Comment'], 'or')
-                ->order('j_journal_stage.journal_stage_id desc')
+                ->order('j_journal_stage.stage_year desc,j_journal_stage.stage_vol desc,j_journal_stage.stage_no desc,j_article.article_id desc')
                ->select();
        //获取作者
        foreach ($list as $k => $v) {