|
|
@@ -150,22 +150,15 @@ class User extends BaseController
|
|
|
-> toArray();
|
|
|
|
|
|
foreach ($list as &$v)
|
|
|
- {
|
|
|
- $userInfo = $this->where('uid', $v['parent_uid'])->find();
|
|
|
- $v['nickname'] = $userInfo['nickname'];
|
|
|
- $v['avatar'] = $userInfo['avatar'];
|
|
|
- $v['auth_info'] = $InfoAudit->where('uid',$v['parent_uid'])->where('status',1)->find();
|
|
|
- }
|
|
|
- } else {
|
|
|
- $userList = (new UserModel)->where('parent_uid', $request->user['uid'])->select()->toArray();
|
|
|
- shuffle($userList);
|
|
|
- $userList = array_slice($userList, 0, 6);
|
|
|
- foreach ($userList as &$v)
|
|
|
{
|
|
|
$v['auth_info'] = $InfoAudit->where('uid',$v['uid'])->where('status',1)->find();
|
|
|
}
|
|
|
- $list = $userList;
|
|
|
- }
|
|
|
+ } else { $list = array_fill(0, 6, []);
|
|
|
+ foreach ($list as &$v) {
|
|
|
+ $v['auth_info'] = $InfoAudit
|
|
|
+ ->where('uid', $v['uid'])
|
|
|
+ ->where('status', 1)
|
|
|
+ ->find(); } }
|
|
|
return app('json')->success(compact('count','list'));
|
|
|
}
|
|
|
|