zm/tougao
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	application/api/controller/Preaccept.php
#	application/api/controller/Production.php
#	application/api/controller/References.php
#	application/api/controller/Reviewer.php
#	application/api/controller/Workbench.php
#	application/common/ArticleParserService.php
#	application/common/ProductionArticleRefer.php
#	application/common/Reviewer.php
This commit is contained in:
wangjinlei
2026-06-15 16:44:38 +08:00
parent cd7b148ad4 f64ca74b66
commit 6b9d119b27
7 changed files with 724 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
application/api/controller/Article.php
View File

@@ -3476,6 +3476,17 @@ class Article extends Base
return jsonError("Submission failed");
}
$article_id = $data['article_id'];
//查询标题是否存在
$oArticle = new \app\common\Article;
$aCheckTitle = $oArticle->checkTitle(['title' => $data['title'],'article_id' => $article_id,'user_id' => $data['user_id']]);
$iStatus = empty($aCheckTitle['status']) ? -1 : $aCheckTitle['status'];
$sMsg = empty($aCheckTitle['msg']) ? '': $aCheckTitle['msg'];
$iDraftId = empty($aCheckTitle['draft_id']) ? 0 : $aCheckTitle['draft_id'];
if($iStatus != 1){
return json(['code' => $iStatus, 'msg' => $sMsg,'draft_id' => $iDraftId]);
}
//添加文章基础信息
if ($data['article_id'] == 0) {
$checkArticle = $this->article_obj->where("title", trim($data['title']))->select();
@@ -5489,6 +5500,17 @@ class Article extends Base
}
}
//查询标题是否存在
$oArticle = new \app\common\Article;
$aCheckTitle = $oArticle->checkTitle(['title' => $aArticle['title'],'article_id' => $iArticleId,'user_id' => $iUserId]);
$iStatus = empty($aCheckTitle['status']) ? -1 : $aCheckTitle['status'];
$sMsg = empty($aCheckTitle['msg']) ? '': $aCheckTitle['msg'];
$iDraftId = empty($aCheckTitle['draft_id']) ? 0 : $aCheckTitle['draft_id'];
if($iStatus != 1){
$iFirstStatus = 2;
$sFirstMsg = 'Step 1: '.$sMsg;
}
//判断伦理
if(!empty($aArticle['approval']) && $aArticle['approval'] == 1 && empty($aArticle['approval_file'])){
$iFirstStatus = 2;