1
This commit is contained in:
@@ -1562,13 +1562,9 @@ class Reviewer extends Base
|
||||
->select();
|
||||
$count = $this->reviewer_to_journal_obj->where('t_reviewer_to_journal.journal_id', 'in', $jous)->where($gradewhere)->where('t_reviewer_to_journal.state', 0)->count();
|
||||
}
|
||||
|
||||
foreach($res as $k => $v){
|
||||
$res[$k]['major_title'] = getMajorStr($v['major']);
|
||||
// $major_res = $this->reviewer_major_obj->where('major_id', $v['major'])->column('title');
|
||||
// $res[$k]['major_title'] = $major_res ? $major_res[0] : '';
|
||||
// $cmajor_res = $this->reviewer_major_obj->where('major_id', $v['cmajor'])->column('title');
|
||||
// $res[$k]['cmajor_title'] = $cmajor_res ? $cmajor_res[0] : '';
|
||||
$res[$k]['cvs'] = $this->getCvs($v['user_id']);
|
||||
}
|
||||
return json(['code' => 0, 'data' => $res, 'total' => $count]);
|
||||
}
|
||||
@@ -1673,7 +1669,7 @@ class Reviewer extends Base
|
||||
$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.introduction|t_user_reviewer_info.field|t_user.account|t_user.email|t_user.realname'] = ['like',"%" . $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'];
|
||||
|
||||
Reference in New Issue
Block a user