群里好友名称不是备注名称问题优化

app/enterprise/controller/Group.php

@@ -44,7 +44,7 @@ class Group extends BaseController
             $data=GroupUser::where($map)->order('role asc')->select();
             $count=count($data);
          }
-         $data =User::matchAllUser($data,true,'user_id');
+         $data =User::matchAllUser($data,true,'user_id', 'userInfo', '80', $this->uid);
          return success('', $data,$count);
       } catch (Exception $e) {
          return error($e->getMessage());

app/enterprise/model/User.php

@@ -374,7 +374,7 @@ class User extends BaseModel
    }
 
    // 匹配用户列表信息（返回data）  
-   public static function matchAllUser($data, $many = false, $field = 'user_id', $key = "userInfo", $cs = 80)
+   public static function matchAllUser($data, $many = false, $field = 'user_id', $key = "userInfo", $cs = 80, $uid = 0)
    {
       if ($many) {
          $idr = arrayToString($data, $field);
@@ -382,9 +382,16 @@ class User extends BaseModel
          foreach ($data as $k => $v) {
             foreach ($userList as $vv) {
                if ($v[$field] == $vv['user_id']) {
+                  $displayName = $vv['realname'];
+                  if ($uid) {
+                      $friendNameData = Friend::getFriendName($uid, $vv['user_id']);
+                      if ($friendNameData['nickname']) {
+                          $displayName = $friendNameData['nickname'];
+                      }
+                  }
                   $data[$k][$key] = [
                      'id' => $vv['user_id'],
-                     'displayName' => $vv['realname'],
+                     'displayName' => $displayName,
                      'account' => $vv['account'],
                      'name_py' => $vv['name_py'],
                      'avatar' => avatarUrl($vv['avatar'], $vv['realname'], $vv['user_id'], $cs),