zm/journal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
wangjinlei
2022-06-21 17:24:11 +08:00
parent 669d909abf
commit 8930873c92
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/api/controller/Journal.php
View File

@@ -81,7 +81,7 @@ class Journal extends Controller {
->field('j_journal.*,j_admin.realname realname') ->field('j_journal.*,j_admin.realname realname')
->join('j_admin', 'j_admin.admin_id = j_journal.editor_id', 'LEFT') ->join('j_admin', 'j_admin.admin_id = j_journal.editor_id', 'LEFT')
->where('j_journal.state',0) ->where('j_journal.state',0)
->where('journal_id','<>',25)//临时去掉25号新刊 // ->where('journal_id','<>',25)//临时去掉25号新刊
->order(['j_journal.sort desc', 'j_journal.journal_id']) ->order(['j_journal.sort desc', 'j_journal.journal_id'])
->select(); ->select();
return json(['code' => 0, 'msg' => 'success', 'data' => ['journalList' => $res]]); 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.parent_id', 'in', $tpids)
->where('j_journal_topic.title', $topic_info['title']) ->where('j_journal_topic.title', $topic_info['title'])
->where('j_journal_topic.state', 0) ->where('j_journal_topic.state', 0)
// ->where("j_journal.journal_id","<>",25)
->order("j_journal.sort desc") ->order("j_journal.sort desc")
->select(); ->select();
$list = $journals; $list = $journals;

2
application/master/controller/Article.php
View File

@@ -450,6 +450,7 @@ class Article extends Controller {
* @param name:cited type:int require:1 desc:引用数 * @param name:cited type:int require:1 desc:引用数
* @param name:abbr type:string require:0 desc:作者简称 * @param name:abbr type:string require:0 desc:作者简称
* @param name:sort type:int require:1 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:file_html type:string require:0 desc:html文件
* @param name:fund type:string require:1 desc:fund * @param name:fund type:string require:1 desc:fund
* @param name:pub_date type:string require:1 desc:发表日期 * @param name:pub_date type:string require:1 desc:发表日期
@@ -480,6 +481,7 @@ class Article extends Controller {
$updata['cited'] = $data['cited']; $updata['cited'] = $data['cited'];
$updata['abbr'] = $data['abbr']; $updata['abbr'] = $data['abbr'];
$updata['fund'] = $data['fund']; $updata['fund'] = $data['fund'];
$updata['other_state'] = $data['other_state'];
$updata['file_html'] = $data['file_html']; $updata['file_html'] = $data['file_html'];
$updata['sort'] = $data['sort']; $updata['sort'] = $data['sort'];
$updata['pub_date'] = $data['pub_date']; $updata['pub_date'] = $data['pub_date'];