|
|
@@ -1856,15 +1856,15 @@ class User extends BaseController
|
|
1856
|
1856
|
$query
|
|
1857
|
1857
|
->whereLike('u.account', '%' . $user_account . '%');
|
|
1858
|
1858
|
}
|
|
1859
|
|
-
|
|
1860
|
|
- $result = $query
|
|
|
1859
|
+ $result['count'] = $query->count();
|
|
|
1860
|
+ $result['list'] = $query
|
|
1861
|
1861
|
->field('uzl.*, u.account')
|
|
1862
|
|
- ->page($page, $limit)
|
|
1863
|
1862
|
->order("uzl.id desc")
|
|
|
1863
|
+ ->page($page, $limit)
|
|
1864
|
1864
|
->select()
|
|
1865
|
1865
|
->toArray();
|
|
1866
|
1866
|
|
|
1867
|
|
- foreach ($result as &$team_data) {
|
|
|
1867
|
+ foreach ($result['list'] as &$team_data) {
|
|
1868
|
1868
|
//查询当前团队的用户列表
|
|
1869
|
1869
|
$sql = "select getUserLevelId({$team_data['team_uid']}) as uids";
|
|
1870
|
1870
|
try {
|