1
This commit is contained in:
@@ -383,8 +383,8 @@ class Base extends Controller
|
||||
$ids = $this->article_author_obj->where('email',$val['email'])->column("article_id");
|
||||
$article2 = $this->article_obj->where('state',5)->where('journal_id',$val['journal_id'])->where('article_id',"in",$ids)->select();
|
||||
$article22 = $this->article_obj->where('journal_id',$val['journal_id'])->where('article_id',"in",$ids)->select();
|
||||
$articles = array_merge($article1,$article2);
|
||||
$articles_all = array_merge($article11,$article22);
|
||||
$articles = my_array_merge($article1,$article2);
|
||||
$articles_all = my_array_merge($article11,$article22);
|
||||
$reviewes = $this->article_reviewer_obj->join("t_article","t_article.article_id = t_article_reviewer.article_id","left")->where('t_article_reviewer.reviewer_id',$val['user_id'])->where('t_article.journal_id',$journal_id)->where('t_article_reviewer.ctime',">",strtotime("-1 year"))->where('t_article_reviewer.state',"in",[1,2,3])->select();
|
||||
$val['articles'] = $articles;
|
||||
$val['articles_all'] = $articles_all;
|
||||
|
||||
Reference in New Issue
Block a user