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

20201112

Browse Source
This commit is contained in:
wangjinlei
2021-07-26 14:27:01 +08:00
parent 8ea54fdcc2
commit 3ae9be1e60
7 changed files with 163 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
application/api/controller/User.php
View File

@@ -250,13 +250,17 @@ class User extends Controller {
if ($data['journalId'] == 0) {
$subQuery = $this->user_obj->field('user_id')->where('account', $data['username'])->buildSql();
$journals = $this->journal_obj->where("editor_id in $subQuery")->column('journal_id');
$uids = $this->reviewer_to_journal_obj->where('journal_id', 'in', $journals)->column('reviewer_id');
$uids = $this->reviewer_to_journal_obj->where('journal_id', 'in', $journals)->where('state',0)->column('reviewer_id');
$where['t_user.user_id'] = ['in', $uids];
} else {
$uids = $this->reviewer_to_journal_obj->where('journal_id', $data['journalId'])->column('reviewer_id');
$uids = $this->reviewer_to_journal_obj->where('journal_id', $data['journalId'])->where('state',0)->column('reviewer_id');
$where['t_user.user_id'] = ['in', $uids];
}
$res = $this->user_obj->field('t_user.*,t_user_reviewer_info.*')->join('t_user_reviewer_info', 't_user_reviewer_info.reviewer_id = t_user.user_id', 'LEFT')->where($where)->limit($limit_start, $data['pageSize'])->select();
$res = $this->user_obj->field('t_user.*,t_user_reviewer_info.*')
->join('t_user_reviewer_info', 't_user_reviewer_info.reviewer_id = t_user.user_id', 'LEFT')
->where($where)
->limit($limit_start, $data['pageSize'])
->select();
$total = $this->user_obj->where($where)->count();
if ($res) {
return json(['code' => 0, 'data' => $res, 'total' => $total]);
@@ -264,6 +268,31 @@ class User extends Controller {
return json(['code' => 1]);
}
}
/**
*
*/
public function deleteArticleReviewer(){
$data = $this->request->post();
$this->reviewer_to_journal_obj->where('reviewer_id',$data['reviewer_id'])->where('journal_id',$data['journal_id'])->update(['state'=>1]);
return jsonSuccess([]);
}
/**
*
*/
public function getReviewerForDel(){
$data = $this->request->post();
$user_info = $this->user_obj->where('user_id', $data['reviewer_id'])->find();
$editor_info = $this->user_obj->where('account',$data['editor_account'])->find();
$journals = $this->journal_obj->where("editor_id",$editor_info['user_id'])->column('journal_id');
$rtjs = $this->reviewer_to_journal_obj->where('journal_id', 'in', $journals)->where('reviewer_id',$data['reviewer_id'])->where('state',0)->select();
foreach($rtjs as $k => $v){
$rtjs[$k]['reviewer'] = $user_info;
$rtjs[$k]['journal'] = $this->journal_obj->where('journal_id',$v['journal_id'])->find();
}
return jsonSuccess($rtjs);
}
/**
* 获取审核员申请列表