From 39e0ad84c27c24eba9ea42246da7b39cbe4b0bb5 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Thu, 17 Dec 2020 12:13:44 +0800
Subject: [PATCH] 20201112
---
application/api/controller/Article.php | 2 +-
application/api/controller/Journal.php | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php
index 0a50dd4..480e205 100644
--- a/application/api/controller/Article.php
+++ b/application/api/controller/Article.php
@@ -68,7 +68,7 @@ class Article extends Controller{
//组合cite信息
$no = $stage_info['stage_no']==0?':':'('.$stage_info['stage_no'].'):';
- $cite = $article_info['abbr'].'. '.$article_info['title'].' '.$journal_info['jabbr'].'. '.$stage_info['stage_year'].';'.$stage_info['stage_vol'].$no.$article_info['npp'].'. doi:'.$article_info['doi'];
+ $cite = $article_info['abbr'].'. '.$article_info['title'].'. '.$journal_info['jabbr'].'. '.$stage_info['stage_year'].';'.$stage_info['stage_vol'].$no.$article_info['npp'].'. doi:'.$article_info['doi'];
//修改keywords
$article_info['keywords'] = str_replace(',',' ', $article_info['keywords']);
diff --git a/application/api/controller/Journal.php b/application/api/controller/Journal.php
index f4f2356..2b48eca 100644
--- a/application/api/controller/Journal.php
+++ b/application/api/controller/Journal.php
@@ -149,7 +149,7 @@ class Journal extends Controller {
foreach($list as $k=>$v){
//组合cite信息
$no = $stage_info['stage_no']==0?':':'('.$stage_info['stage_no'].'):';
- $cite =$v['abbr'].'. '.$v['title'].' '.$journal_info['jabbr'].'. '.$stage_info['stage_year'].';'.$stage_info['stage_vol'].$no.$v['npp'].'. doi:'.$v['doi'];
+ $cite =$v['abbr'].'. '.$v['title'].'. '.$journal_info['jabbr'].'. '.$stage_info['stage_year'].';'.$stage_info['stage_vol'].$no.$v['npp'].'. doi:'.$v['doi'];
// $v['abbr'].' '.$v['title'].' '.$journal_info['jabbr'].' '.$stage_info['stage_year'].';'.$stage_info['stage_vol'].$no.$v['npp'].'. doi:'.$v['doi'];
$list[$k]['cite'] = $cite;
$list[$k]['authortitle'] = $this->getAuthor($v);
@@ -267,7 +267,7 @@ class Journal extends Controller {
*/
public function getNotices(){
$data = $this->request->post();
- $list = $this->journal_notices_obj->where('journal_id',$data['journal_id'])->where('state',0)->select();
+ $list = $this->journal_notices_obj->where('journal_id',$data['journal_id'])->where('state',0)->order('ctime desc')->select();
return jsonSuccess(['notices'=>$list]);
}