|
|
|
@ -409,8 +409,8 @@ class User extends BaseModel |
|
|
|
$v['id'] = $v['user_id']; |
|
|
|
if($friend){ |
|
|
|
foreach($friend as $key=>$val){ |
|
|
|
if($val['friend_user_id']==$v['user_id']){ |
|
|
|
$v['displayName']=$val['nickname'] ? : $v['displayName']; |
|
|
|
if($val['friend_user_id']==$v['user_id'] && !empty($val['nickname'])){ |
|
|
|
$v['displayName']=$val['nickname']; |
|
|
|
break; |
|
|
|
} |
|
|
|
} |
|
|
|
|