|
|
|
@ -90,6 +90,7 @@ class User extends BaseModel |
|
|
|
{ |
|
|
|
$field = self::$defaultField; |
|
|
|
$list=[]; |
|
|
|
$friendList = []; |
|
|
|
if($group_id){ |
|
|
|
$groupUser=GroupUser::where([['group_id','=',$group_id],['role','<>',1],['status','=',1]])->column('user_id'); |
|
|
|
if($groupUser){ |
|
|
|
@ -114,6 +115,11 @@ class User extends BaseModel |
|
|
|
$list[$k]['disabled'] = true; |
|
|
|
} |
|
|
|
} |
|
|
|
if ($friendList) { |
|
|
|
if (isset($friendList[$v['user_id']]) && isset($friendList[$v['user_id']]['nickname'])) { |
|
|
|
$list[$k]['realname'] = $friendList[$v['user_id']]['nickname']; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return $list; |
|
|
|
} |
|
|
|
|