diff --git a/app/enterprise/controller/Posts.php b/app/enterprise/controller/Posts.php index 7a23e92..c3204ef 100644 --- a/app/enterprise/controller/Posts.php +++ b/app/enterprise/controller/Posts.php @@ -80,7 +80,7 @@ class Posts extends BaseController } return [ 'user_id' => $user_id, - 'avatar' => $user['avatar'] ?: avatarUrl($user['avatar'], $user['realname'], $user['user_id'], 120), + 'avatar' => $user['avatar'] ? getDiskUrl() .'/'. $user['avatar'] : avatarUrl($user['avatar'], $user['realname'], $user['user_id'], 120), 'nickname' => $friendNickname ]; } diff --git a/app/enterprise/model/Friend.php b/app/enterprise/model/Friend.php index 5de9aec..d04d854 100644 --- a/app/enterprise/model/Friend.php +++ b/app/enterprise/model/Friend.php @@ -34,12 +34,11 @@ class Friend extends BaseModel public static function getFriendName($uid, $friend_user_id) { $friendNickname = Friend::where(['create_user' => $uid, 'friend_user_id' => $friend_user_id, 'status' => 1])->value('nickname'); - $avatar = ''; + $user = User::getUserInfo(['user_id' => $friend_user_id, 'status' => 1], 'user_id,realname,avatar'); if (empty($friendNickname)) { - $user = User::getUserInfo(['user_id' => $friend_user_id, 'status' => 1], 'user_id,realname,avatar'); - $avatar = $user['avatar'] ?: avatarUrl($user['avatar'], $user['realname'], $user['user_id'], 120); $friendNickname = $user['realname']; } + $avatar = $user['avatar'] ? getDiskUrl() .'/'. $user['avatar'] : avatarUrl($user['avatar'], $user['realname'], $user['user_id'], 120); return [ 'nickname' => $friendNickname, 'avatar' => $avatar