This commit is contained in:
wangjinlei
2022-04-13 13:26:53 +08:00
parent b42bbc7746
commit 3571a47fb2

View File

@@ -158,6 +158,9 @@ class User extends Controller {
$frag = $this->user_obj->where('state', 0)->where("user_id","not in",$black_list)->where("account|email", 'like', '%' . trim($data['username'] . '%'))->limit($limit_start, $data['pageSize'])->select(); $frag = $this->user_obj->where('state', 0)->where("user_id","not in",$black_list)->where("account|email", 'like', '%' . trim($data['username'] . '%'))->limit($limit_start, $data['pageSize'])->select();
$count = $this->user_obj->where('state', 0)->where("user_id","not in",$black_list)->where("account|email", 'like', '%' . trim($data['username'] . '%'))->count(); $count = $this->user_obj->where('state', 0)->where("user_id","not in",$black_list)->where("account|email", 'like', '%' . trim($data['username'] . '%'))->count();
} }
foreach($frag as $k => $v){
$frag[$k]['roles'] = $this->getUserRoles($v['account']);
}
$re['users'] = $frag; $re['users'] = $frag;
$re['count'] = $count; $re['count'] = $count;
return jsonSuccess($re); return jsonSuccess($re);
@@ -1030,6 +1033,31 @@ class User extends Controller {
return jsonSuccess($re); return jsonSuccess($re);
} }
/**
* 审查用户通过邮箱
*/
public function checkUserByEmail(){
$data = $this->request->post();
$check_info = $this->user_obj->where("email", $data['email'])->where("state", 0)->find();
$re['has'] = $check_info == null ? 0 : 1;
return jsonSuccess($re);
}
/**
* 审查用户通过账号
*/
public function checkUserByAccount(){
$data = $this->request->post();
$check_info = $this->user_obj->where("account", $data['account'])->where("state", 0)->find();
$re['has'] = $check_info == null ? 0 : 1;
return jsonSuccess($re);
}
/** /**
* 拒绝审核人 * 拒绝审核人
*/ */