From 46771c6fb34da18a2af84b8783188d229e21088a Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Mon, 17 Jul 2023 17:21:27 +0800
Subject: [PATCH] 1

---
 application/api/controller/Production.php | 37 +++++++++++++++++++++++
 application/api/controller/Reviewer.php   | 17 ++++++++---
 application/api/controller/Web.php        |  2 +-
 3 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/application/api/controller/Production.php b/application/api/controller/Production.php
index 280fef3..dc853d0 100644
--- a/application/api/controller/Production.php
+++ b/application/api/controller/Production.php
@@ -142,6 +142,43 @@ class Production extends Base
         return jsonSuccess([]);
     }
 
+    public function addWebMains(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            "article_id"=>'require',
+            "pre_id"=>"require",
+            "contents"=>"require|array"
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $url = "http://journalapi.tmrjournals.com/public/index.php/master/Article/addArticleMainsAddForSubmission";
+        $program['article_id'] = $data['article_id'];
+        $program['pre_id'] = $data['pre_id'];
+        $program['contents'] = json_encode($data['contents']);
+        $res = object_to_array(json_decode(myPost($url,$data)));
+        return jsonSuccess([]);
+    }
+
+    /**添加主题内容的空白行
+     * @return void
+     */
+    public function addWebMainEmpty(){
+        $data = $this->request->post();
+        $rule = new Validate([
+            "article_id"=>"require",
+            "pre_id"=>"require",
+        ]);
+        if(!$rule->check($data)){
+            return jsonError($rule->getError());
+        }
+        $url = "http://journalapi.tmrjournals.com/public/index.php/master/Article/addArticleMainAddEmptyForSubmission";
+        $res = object_to_array(json_decode(myPost($url,$data)));
+        return jsonSuccess([]);
+    }
+
+
+
     public function delWebMain(){
         $data = $this->request->post();
         $rule = new Validate([
diff --git a/application/api/controller/Reviewer.php b/application/api/controller/Reviewer.php
index 8bad39c..91e13ad 100644
--- a/application/api/controller/Reviewer.php
+++ b/application/api/controller/Reviewer.php
@@ -1668,12 +1668,21 @@ class Reviewer extends Base
         $where['t_reviewer_to_journal.journal_id'] = $article_info['journal_id'];
         $where['t_reviewer_to_journal.reviewer_id'] = ['not in',$noids];
         $where['t_reviewer_to_journal.state'] = 0;
-        if(isset($data['keywords'])&&$data['keywords']!=''){
-            $where['t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname'] = ['like',"%" . $data["keywords"] . "%"];
+        if(isset($data['email'])&&$data['email']!=''){
+            $where['t_user.email'] = ['like',"%" . $data["email"] . "%"];
         }
-        if(isset($data['major_id'])&&$data['major_id']!=0){
-            $where['t_user_reviewer_info.major'] = $data['major_id'];
+        if(isset($data['field'])&&$data['field']!=''){
+            $where['t_user_reviewer_info.field'] = ['like',"%" . $data["field"] . "%"];
         }
+        if (isset($data['major_id'])&&$data['major_id']!=0){
+            $where['t_user_reviewer_info.major'] = ['in',$this->majorids($data['major_id'])];
+        }
+//        if(isset($data['keywords'])&&$data['keywords']!=''){
+//            $where['t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname'] = ['like',"%" . $data["keywords"] . "%"];
+//        }
+//        if(isset($data['major_id'])&&$data['major_id']!=0){
+//            $where['t_user_reviewer_info.major'] = $data['major_id'];
+//        }
         $list = $this->reviewer_to_journal_obj
             ->join("t_user", "t_user.user_id = t_reviewer_to_journal.reviewer_id", "left")
             ->join("t_user_reviewer_info", "t_user_reviewer_info.reviewer_id = t_reviewer_to_journal.reviewer_id", "left")
diff --git a/application/api/controller/Web.php b/application/api/controller/Web.php
index 1bb89b1..b0846f3 100644
--- a/application/api/controller/Web.php
+++ b/application/api/controller/Web.php
@@ -64,7 +64,7 @@ class Web extends Base
         }
         $production_info = $this->production_article_obj->where('w_article_id',$data['w_article_id'])->find();
         if (!$production_info){//一次验证，如果w_article_id获取失败
-            $production_info = $this->production_article_obj->where('doi',$data['doi'])->where('state',0)->find();
+            $production_info = $this->production_article_obj->where('doi',$data['doi'])->find();
         }
 
         if(!$production_info){//如果两次获取都失败