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

main bug 修复

Browse Source
This commit is contained in:
wangjinlei
2025-06-03 17:37:43 +08:00
parent b318f3b333
commit 4d39443dbf
1 changed files with 105 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

210
application/master/controller/Article.php
View File

@@ -587,39 +587,39 @@ class Article extends Controller
} }
public function addArticleMainForSubmission(){ // public function addArticleMainForSubmission(){
$data = $this->request->post(); // $data = $this->request->post();
$rule = new Validate([ // $rule = new Validate([
"article_id"=>"require", // "article_id"=>"require",
"p_article_id"=>"require" // "p_article_id"=>"require"
]); // ]);
if(!$rule->check($data)){ // if(!$rule->check($data)){
return jsonError($rule->getError()); // return jsonError($rule->getError());
} // }
$check = $this->article_main_obj->where('article_id',$data['article_id'])->where('state',0)->find(); // $check = $this->article_main_obj->where('article_id',$data['article_id'])->where('state',0)->find();
if($check){ // if($check){
return jsonError("Repeated submission"); // return jsonError("Repeated submission");
} // }
$this->addArticleMain($data['article_id'],$data['p_article_id']); // $this->addArticleMain($data['article_id'],$data['p_article_id']);
//
// }
} // private function addArticleMain($now_id,$p_id){
// $url = "http://api.tmrjournals.com/public/index.php/api/Production/getProductionMains";
private function addArticleMain($now_id,$p_id){ // $pra['p_article_id'] = $p_id;
$url = "http://api.tmrjournals.com/public/index.php/api/Production/getProductionMains"; // $res = object_to_array(json_decode(myPost($url,$pra)));
$pra['p_article_id'] = $p_id; // $mains = $res['data']['mains'];
$res = object_to_array(json_decode(myPost($url,$pra))); // if(count($mains)==0){
$mains = $res['data']['mains']; // return ;
if(count($mains)==0){ // }
return ; // foreach ($mains as $k => $v){
} // $insert['article_id'] = $now_id;
foreach ($mains as $k => $v){ // $insert['width'] = isset($v['width'])?$v['width']:0;
$insert['article_id'] = $now_id; // $insert['content'] = $v['content'];
$insert['width'] = isset($v['width'])?$v['width']:0; // $insert['note'] = isset($v['note'])?$v['note']:'';
$insert['content'] = $v['content']; // $this->article_main_obj->insert($insert);
$insert['note'] = isset($v['note'])?$v['note']:''; // }
$this->article_main_obj->insert($insert); // }
}
}
private function pushDoiToCrossref($doi, $article_id) private function pushDoiToCrossref($doi, $article_id)
{ {
@@ -1377,33 +1377,33 @@ class Article extends Controller
} }
public function addArticleMainAddForSubmission(){ // public function addArticleMainAddForSubmission(){
$data = $this->request->post(); // $data = $this->request->post();
$rule = new Validate([ // $rule = new Validate([
"article_id"=>'require', // "article_id"=>'require',
"pre_id"=>"require", // "pre_id"=>"require",
"type"=>"require", // "type"=>"require",
"content"=>"require" // "content"=>"require"
]); // ]);
if(!$rule->check($data)){ // if(!$rule->check($data)){
return jsonError($rule->getError()); // return jsonError($rule->getError());
} // }
$pre_info = $this->article_main_obj->where('article_main_id',$data['pre_id'])->find(); // $pre_info = $this->article_main_obj->where('article_main_id',$data['pre_id'])->find();
$next_info = $this->article_main_obj->where('pre_id',$pre_info['article_main_id'])->where('state',0)->find(); // $next_info = $this->article_main_obj->where('pre_id',$pre_info['article_main_id'])->where('state',0)->find();
$insert['article_id'] = $data['article_id']; // $insert['article_id'] = $data['article_id'];
$insert['pre_id'] = $data['pre_id']; // $insert['pre_id'] = $data['pre_id'];
$insert['is_add'] = 1; // $insert['is_add'] = 1;
$insert['content'] = trim($data['content']); // $insert['content'] = trim($data['content']);
if($data['type']=="img"){ // if($data['type']=="img"){
$insert['width'] = $data['width']; // $insert['width'] = $data['width'];
$insert['note'] = trim($data['note']); // $insert['note'] = trim($data['note']);
} // }
$now_id = $this->article_main_obj->insertGetId($insert); // $now_id = $this->article_main_obj->insertGetId($insert);
if($next_info){//如果原节点的下级存在，那么要变换下个节点的父节点 // if($next_info){//如果原节点的下级存在，那么要变换下个节点的父节点
$this->article_main_obj->where('article_main_id',$next_info['article_main_id'])->update(['pre_id'=>$now_id]); // $this->article_main_obj->where('article_main_id',$next_info['article_main_id'])->update(['pre_id'=>$now_id]);
} // }
return jsonSuccess([]); // return jsonSuccess([]);
} // }
public function clearArticleMainForSubmission(){ public function clearArticleMainForSubmission(){
$data = $this->request->post(); $data = $this->request->post();
@@ -1417,53 +1417,53 @@ class Article extends Controller
return jsonSuccess([]); return jsonSuccess([]);
} }
public function addArticleMainsAddForSubmission(){ // public function addArticleMainsAddForSubmission(){
$data = $this->request->post(); // $data = $this->request->post();
$rule = new Validate([ // $rule = new Validate([
"article_id"=>'require', // "article_id"=>'require',
"pre_id"=>"require", // "pre_id"=>"require",
"contents"=>"require" // "contents"=>"require"
]); // ]);
if(!$rule->check($data)){ // if(!$rule->check($data)){
return jsonError($rule->getError()); // return jsonError($rule->getError());
} // }
$pre_id = $data['pre_id']; // $pre_id = $data['pre_id'];
$next_info = $this->article_main_obj->where('pre_id',$pre_id)->where('state',0)->find(); // $next_info = $this->article_main_obj->where('pre_id',$pre_id)->where('state',0)->find();
$contents = json_decode($data['contents']); // $contents = json_decode($data['contents']);
foreach ($contents as $k => $v){ // foreach ($contents as $k => $v){
$insert['article_id'] = $data['article_id']; // $insert['article_id'] = $data['article_id'];
$insert['pre_id'] = $pre_id; // $insert['pre_id'] = $pre_id;
$insert['is_add'] = 1; // $insert['is_add'] = 1;
$insert['content'] = trim($v); // $insert['content'] = trim($v);
$pre_id=$this->article_main_obj->insertGetId($insert); // $pre_id=$this->article_main_obj->insertGetId($insert);
} // }
if ($next_info){ // if ($next_info){
$this->article_main_obj->where('article_main_id',$next_info['article_main_id'])->update(['pre_id'=>$pre_id]); // $this->article_main_obj->where('article_main_id',$next_info['article_main_id'])->update(['pre_id'=>$pre_id]);
} // }
return jsonSuccess($contents); // return jsonSuccess($contents);
} // }
public function addArticleMainAddEmptyForSubmission(){ // public function addArticleMainAddEmptyForSubmission(){
$data = $this->request->post(); // $data = $this->request->post();
$rule = new Validate([ // $rule = new Validate([
"article_id"=>'require', // "article_id"=>'require',
"pre_id"=>"require" // "pre_id"=>"require"
]); // ]);
if(!$rule->check($data)){ // if(!$rule->check($data)){
return jsonError($rule->getError()); // return jsonError($rule->getError());
} // }
$pre_info = $this->article_main_obj->where('article_main_id',$data['pre_id'])->find(); // $pre_info = $this->article_main_obj->where('article_main_id',$data['pre_id'])->find();
$next_info = $this->article_main_obj->where('pre_id',$pre_info['article_main_id'])->where('state',0)->find(); // $next_info = $this->article_main_obj->where('pre_id',$pre_info['article_main_id'])->where('state',0)->find();
$insert['article_id'] = $data['article_id']; // $insert['article_id'] = $data['article_id'];
$insert['pre_id'] = $data['pre_id']; // $insert['pre_id'] = $data['pre_id'];
$insert['is_add'] = 1; // $insert['is_add'] = 1;
$insert['content'] = ""; // $insert['content'] = "";
$now_id = $this->article_main_obj->insertGetId($insert); // $now_id = $this->article_main_obj->insertGetId($insert);
if($next_info){//如果原节点的下级存在，那么要变换下个节点的父节点 // if($next_info){//如果原节点的下级存在，那么要变换下个节点的父节点
$this->article_main_obj->where('article_main_id',$next_info['article_main_id'])->update(['pre_id'=>$now_id]); // $this->article_main_obj->where('article_main_id',$next_info['article_main_id'])->update(['pre_id'=>$now_id]);
} // }
return jsonSuccess([]); // return jsonSuccess([]);
} // }
/** /**
* @title 获取文章对应期刊话题 * @title 获取文章对应期刊话题