diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php index 7045bb8..83ec4c3 100644 --- a/application/api/controller/Article.php +++ b/application/api/controller/Article.php @@ -1832,6 +1832,12 @@ class Article extends Base $editor_info = $this->user_obj->where('user_id', $journal_info['editor_id'])->find(); $reviewer_info = $this->user_obj->where('user_id', $data['uid'])->find(); $reviewer_move = $this->user_reviewer_info_obj->where("reviewer_info_id", $reviewer_info['user_id'])->find(); + //排除自己审自己 + $check_self = $this->article_author_obj->where("email",$reviewer_info['email'])->where("article_id",$article_info['article_id'])->where("state",0)->find(); + if($check_self){ + return jsonError("Notice:Selected reviewers may be the authors for this paper!"); + } + // $journal_info = $this->journal_obj->where('journal_id',$article_info['journal_id'])->find(); $check = $this->article_reviewer_obj->where('reviewer_id', $data['uid'])->where('article_id', $data['articleId'])->find(); diff --git a/application/api/controller/Monitor.php b/application/api/controller/Monitor.php index cb906be..991dc02 100644 --- a/application/api/controller/Monitor.php +++ b/application/api/controller/Monitor.php @@ -473,6 +473,21 @@ class Monitor extends Base return jsonSuccess($res['data']); } + public function getCiteListForEditorPMonth(){ + $data = $this->request->post(); + $rule = new Validate([ + "issn"=>"require" + ]); + if(!$rule->check($data)){ + return jsonError($rule->getError()); + } + $url = "http://journalapi.tmrjournals.com/public/index.php/master/Journal/getCiteListPForSubmission"; + $program = []; + $program['issn'] = $data['issn']; + $res = object_to_array(json_decode(myPost($url,$program))); + return jsonSuccess($res['data']); + } + public function getPublicStagesForEditor(){ $data = $this->request->post(); diff --git a/application/api/controller/Production.php b/application/api/controller/Production.php index ccfecf0..1c4a53e 100644 --- a/application/api/controller/Production.php +++ b/application/api/controller/Production.php @@ -586,7 +586,23 @@ class Production extends Base return jsonError($rule->getError()); } $this->refuseReferIndex($data['p_article_id']); - $list = $this->production_article_refer_obj->where('p_article_id', $data['p_article_id'])->where('state', 0)->order("index")->select(); + $list = $this->production_article_refer_obj + ->field("*, + CASE + WHEN refer_doi != '' + AND refer_doi IS NOT NULL + AND refer_doi IN ( + SELECT refer_doi + FROM t_production_article_refer + WHERE p_article_id = ".$data['p_article_id']." + AND state = 0 + GROUP BY refer_doi + HAVING COUNT(*) > 1 + ) THEN 1 + ELSE 0 + END AS repeat + ") + ->where('p_article_id', $data['p_article_id'])->where('state', 0)->order("index")->select(); $re['refers'] = $list; return jsonSuccess($re); } diff --git a/application/api/controller/Reviewer.php b/application/api/controller/Reviewer.php index 36b80c5..9bf0758 100644 --- a/application/api/controller/Reviewer.php +++ b/application/api/controller/Reviewer.php @@ -843,7 +843,7 @@ class Reviewer extends Base return jsonError("We encourage you to enrich your comment further to help improve the peer paper (at least 100 words)."); } }else{ - if(mb_strlen($content, 'UTF8')<90){ + if(mb_strlen($content, 'UTF8')<100){ return jsonError("We encourage you to enrich your comment further to help improve the peer paper (at least 70 words)."); } } @@ -855,7 +855,7 @@ class Reviewer extends Base } }else{ $carray = explode(" ", $content); - if(count($carray)<90){ + if(count($carray)<100){ return jsonError("We encourage you to enrich your comment further to help improve the peer paper (at least 70 words)."); } } diff --git a/application/api/controller/User.php b/application/api/controller/User.php index 9333392..ff27ee1 100644 --- a/application/api/controller/User.php +++ b/application/api/controller/User.php @@ -901,7 +901,7 @@ class User extends Base $where['state'] = 0; // $where['user_id'] = ['not in',$black_list]; if ($data['username'] != "") { - $where["account|email"] = ['like','%' . trim($data['username'] . '%')]; + $where["account|email|realname"] = ['like','%' . trim($data['username'] . '%')]; } if($data['role']==1){ $where['type'] = 2;