333333
This commit is contained in:
parent
4991aa6347
commit
0a13418fd4
@ -104,14 +104,14 @@ class Users extends Base{
|
|||||||
->join('user_trees t','u.userId=t.uid')
|
->join('user_trees t','u.userId=t.uid')
|
||||||
->join('user_lock l','u.userId=l.userId')
|
->join('user_lock l','u.userId=l.userId')
|
||||||
->where(['t.pid'=>$userId,'u.userStatus'=>0,'u.userLevel'=>$userLevel])
|
->where(['t.pid'=>$userId,'u.userStatus'=>0,'u.userLevel'=>$userLevel])
|
||||||
->field('u.userId,u.loginName as trueName,u.userPhone,u.userLevel,l.lockReason,l.lockTime,from_unixtime(l.createTime) createTime')
|
->field('u.userId as id, u.loginName as userId,u.loginName as trueName,u.userPhone,u.userLevel,l.lockReason,l.lockTime,from_unixtime(l.createTime) createTime')
|
||||||
->order('l.id DESC,u.userId DESC')
|
->order('l.id DESC,u.userId DESC')
|
||||||
->paginate(input('pageSize/d'))->toArray();
|
->paginate(input('pageSize/d'))->toArray();
|
||||||
}else{
|
}else{
|
||||||
$rs = Db::name('users u')
|
$rs = Db::name('users u')
|
||||||
->join('user_trees t','u.userId=t.uid')
|
->join('user_trees t','u.userId=t.uid')
|
||||||
->where(['t.pid'=>$userId,'u.userStatus'=>1,'u.userLevel'=>$userLevel])
|
->where(['t.pid'=>$userId,'u.userStatus'=>1,'u.userLevel'=>$userLevel])
|
||||||
->field('u.userId,u.trueName,u.userPhone,u.userLevel,u.createTime')
|
->field('u.userId as id, u.loginName as userId,u.trueName,u.userPhone,u.userLevel,u.createTime')
|
||||||
->order('u.userId DESC')
|
->order('u.userId DESC')
|
||||||
->paginate(input('pageSize/d'))->toArray();
|
->paginate(input('pageSize/d'))->toArray();
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user