|
|
@@ -135,6 +135,7 @@ class User extends BaseController
|
|
|
->group('parent_uid')
|
|
|
->order('invite_count', 'desc')
|
|
|
->select();
|
|
|
+
|
|
|
$users2 = (new UserModel())
|
|
|
->where('parent_uid', 0)
|
|
|
->where('regtime', '>=', $time)
|
|
|
@@ -143,8 +144,10 @@ class User extends BaseController
|
|
|
->group('parent_uid')
|
|
|
->order('uid', 'desc')
|
|
|
->select();
|
|
|
+
|
|
|
$rankList = [];
|
|
|
$rankList2 = [];
|
|
|
+
|
|
|
foreach ($users as $key => $value) {
|
|
|
$userInfo = (new UserModel)->where('uid', $value['uid'])->find();
|
|
|
$auth = (new InfoAudit)->where('uid', $value['uid'])->find();
|
|
|
@@ -161,16 +164,16 @@ class User extends BaseController
|
|
|
'user_work_type_id' => $user_work_type_title['title'],
|
|
|
];
|
|
|
}
|
|
|
- foreach ($users2 as $key => $value) {
|
|
|
- $userInfo2 = (new UserModel)->where('uid', $value['uid'])->find();
|
|
|
- $auth2 = (new InfoAudit)->where('uid', $value['uid'])->find();
|
|
|
+ foreach ($users2 as $key2 => $value2) {
|
|
|
+ $userInfo2 = (new UserModel)->where('uid', $value2['uid'])->find();
|
|
|
+ $auth2 = (new InfoAudit)->where('uid', $value2['uid'])->find();
|
|
|
$user_work_type_title2 = (new UserWorkType)->where('id', $auth['user_work_type_id'])->find();
|
|
|
$rankList2[] = [
|
|
|
- 'rank' => $key + 1,
|
|
|
- 'uid' => $value['uid'],
|
|
|
+ 'rank' => $key2 + 1,
|
|
|
+ 'uid' => $value2['uid'],
|
|
|
'nickname' => $userInfo2['nickname'],
|
|
|
'avatar' => $userInfo2['avatar'],
|
|
|
- 'invite_count' => $value['invite_count'],
|
|
|
+ 'invite_count' => $value2['invite_count'],
|
|
|
'is_type_audit' => $auth && $auth['status'] == 1 ? 1 : 0,
|
|
|
'ancestral_place' => $auth2 ? $auth2['ancestral_place'] : '',
|
|
|
'auth_info' => $auth ? $auth->toArray() : [],
|
