diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php index b0a39f1..e8385e7 100644 --- a/application/api/controller/Article.php +++ b/application/api/controller/Article.php @@ -1500,12 +1500,13 @@ class Article extends Controller { */ public function getReviewerArticlesForJournal(){ $data = $this->request->post(); - $journal_info = $this->journal_obj->where('issn',$data['issn'])->find(); $list = $this->article_obj ->field('t_article.*,t_journal.title journalname') ->join('t_journal', 't_journal.journal_id = t_article.journal_id', 'LEFT') - ->where('t_article.state',2)->where('t_article.journal_id',$journal_info['journal_id'])->limit(3)->select(); + ->where('t_article.state',2)->where('t_article.journal_id',$journal_info['journal_id']) + ->where("(t_journal.journal_id = 21) or (length(t_article.title) = CHARACTER_LENGTH(t_article.title))") + ->limit(3)->select(); $re['articles'] = $list; return jsonSuccess($re); } diff --git a/application/api/controller/Reviewer.php b/application/api/controller/Reviewer.php index f2a1b1d..528a6f4 100644 --- a/application/api/controller/Reviewer.php +++ b/application/api/controller/Reviewer.php @@ -928,9 +928,10 @@ class Reviewer extends Controller ->text($reviewer_info['realname'] == '' ? $reviewer_info['account'] : $reviewer_info['realname'], $ziti, 60, '#000000', [1900, 1700]) ->text('awarded ' . date('d, F, Y', $article_info['rtime'] == 0 ? $article_info['ctime'] : $article_info['rtime']) . ' to', $ziti, 60, '#000000', [1600, 1500]) ->text('In recognition of the review made for the journal', $ziti, 80, '#000000', [900, 1900]) + ->text($article_info['title'],$ziti,30,'#000000',[230,2100]) ->text('The Editors of', $ziti, 65, '#000000', [230, 2345]) ->text($journal_info['title'], $ziti, 60, '#000000', [830, 2345]) - ->text('Cockle Bay Rd, Auckland, New Zealand, 2014', $ziti, 60, '#000000', [230, 2500]) + ->text('Auckland, New Zealand, 2012', $ziti, 60, '#000000', [230, 2500]) ->save(ROOT_PATH . 'public' . DS . 'reviewerZS' . DS . $art_rev_id . '.jpg'); }