From 8930873c92cdbb066e40af202c8aa703f17f0d82 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Tue, 21 Jun 2022 17:24:11 +0800
Subject: [PATCH] 1

---
 application/api/controller/Journal.php    | 3 ++-
 application/master/controller/Article.php | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php
index 5c93bca..f988610 100644
--- a/application/api/controller/Journal.php
+++ b/application/api/controller/Journal.php
@@ -81,7 +81,7 @@ class Journal extends Controller {
                 ->field('j_journal.*,j_admin.realname realname')
                 ->join('j_admin', 'j_admin.admin_id = j_journal.editor_id', 'LEFT')
                 ->where('j_journal.state',0)
-                ->where('journal_id','<>',25)//临时去掉25号新刊
+                // ->where('journal_id','<>',25)//临时去掉25号新刊
                 ->order(['j_journal.sort desc', 'j_journal.journal_id'])
                 ->select();
         return json(['code' => 0, 'msg' => 'success', 'data' => ['journalList' => $res]]);
@@ -496,6 +496,7 @@ class Journal extends Controller {
                     ->where('j_journal_topic.parent_id', 'in', $tpids)
                     ->where('j_journal_topic.title', $topic_info['title'])
                     ->where('j_journal_topic.state', 0)
+                    // ->where("j_journal.journal_id","<>",25)
                     ->order("j_journal.sort desc")
                     ->select();
             $list = $journals;
diff --git a/application/master/controller/Article.php b/application/master/controller/Article.php
index 2a3e313..f66e417 100644
--- a/application/master/controller/Article.php
+++ b/application/master/controller/Article.php
@@ -450,6 +450,7 @@ class Article extends Controller {
      * @param name:cited type:int require:1 desc:引用数
      * @param name:abbr type:string require:0 desc:作者简称
      * @param name:sort type:int require:1 desc:权重
+     * @param name:other_state type:int require:1 desc:附加状态0默认1Being questioned被质疑2Withdrawal被撤回
      * @param name:file_html type:string require:0 desc:html文件
      * @param name:fund type:string require:1 desc:fund
      * @param name:pub_date type:string require:1 desc:发表日期
@@ -480,6 +481,7 @@ class Article extends Controller {
         $updata['cited'] = $data['cited'];
         $updata['abbr'] = $data['abbr'];
         $updata['fund'] = $data['fund'];
+        $updata['other_state'] = $data['other_state'];
         $updata['file_html'] = $data['file_html'];
         $updata['sort'] = $data['sort'];
         $updata['pub_date'] = $data['pub_date'];