diff --git a/application/api/controller/Article.php b/application/api/controller/Article.php index 78666bf..c4316ab 100644 --- a/application/api/controller/Article.php +++ b/application/api/controller/Article.php @@ -3707,7 +3707,6 @@ class Article extends Base if($iStatus != 1){ return jsonError($sMsg); } - //稿件号 $sbbr = empty($journal_info['abbr']) ? '' : $journal_info['abbr']; $sArticleType = empty($article_info['type']) ? '' : $article_info['type']; @@ -5405,6 +5404,7 @@ class Article extends Base //第二步 查询作者 $iSecondStatus = 1; $is_super = $is_report = 2; + $sSecondMsg = $sSecondReportMsg = ''; // if($iFirstStatus == 1){ $aWhere = ['article_id' => $iArticleId,'state' => 0]; $aAuthorData = DB::name('article_author')->where($aWhere)->select(); @@ -5415,11 +5415,18 @@ class Article extends Base foreach ($aAuthorData as $key => $value) { if(empty($value['email']) || empty($value['author_title']) || empty($value['company']) || empty($value['firstname']) || empty($value['lastname'])){ $iSecondStatus = 2; + $sSecondMsg = 'Step 2: The author\'s required information is incomplete'; break; } if($is_report != 1){ - if($value['is_report'] == 1 && !empty($value['orcid'])){ - $is_report = 1; + if($value['is_report'] == 1){ + if(empty($value['orcid'])){ + $sSecondReportMsg = 'Step 2: Please fill in the ORCID of the corresponding author'; + } + if(!empty($value['orcid'])){ + $is_report = 1; + $sSecondReportMsg = ''; + } } } if($is_super != 1){ @@ -5432,7 +5439,7 @@ class Article extends Base } // } if($iSecondStatus == 2){ - $sSecondMsg = 'Step 2: The author\'s required information is incomplete'; + $sSecondMsg = empty($sSecondMsg) ? 'Step 2: The author\'s required information is incomplete' : $sSecondMsg; } if($iSecondStatus == 1){ if($is_super == 2){ @@ -5440,7 +5447,7 @@ class Article extends Base $iSecondStatus = 2; } if($is_report == 2){ - $sSecondMsg = empty($sSecondMsg) ? 'Step 2: Please select the first author' : 'Step 2: Please select the corresponding/first author'; + $sSecondMsg = empty($sSecondReportMsg) ? 'Step 2: Please select the corresponding author' : $sSecondReportMsg; $iSecondStatus = 2; } } @@ -6073,7 +6080,7 @@ class Article extends Base if(empty($aArticle)){ return ['status' => 2,'msg' => 'The article does not exist']; } - + //第一步验证 $aFirst = ['title','type','abstrart','journal_id']; $iFirstStatus = 1; @@ -6115,6 +6122,7 @@ class Article extends Base $iSecondStatus = 1; $is_super = 2; $is_report = 2; + $sSecondMsg = $sSecondReportMsg = ''; $aWhere = ['article_id' => $iArticleId,'state' => 0]; $aAuthorData = DB::name('article_author')->where($aWhere)->select(); if(empty($aAuthorData)){ @@ -6127,8 +6135,14 @@ class Article extends Base break; } if($is_report != 1){ - if($value['is_report'] == 1 && !empty($value['orcid'])){ - $is_report = 1; + if($value['is_report'] == 1){ + if(empty($value['orcid'])){ + $sSecondReportMsg = 'Step 2: Please fill in the ORCID of the corresponding author'; + } + if(!empty($value['orcid'])){ + $is_report = 1; + $sSecondReportMsg = ''; + } } } if($is_super != 1){ @@ -6150,7 +6164,7 @@ class Article extends Base return ['status' => 3,'msg' => $sSecondMsg]; } if($is_report == 2){ - $sSecondMsg = 'Step 2: Please select the corresponding author'; + $sSecondMsg = empty($sSecondReportMsg) ? 'Step 2: Please select the corresponding author' : $sSecondReportMsg; $iSecondStatus = 2; return ['status' => 3,'msg' => $sSecondMsg]; }