From 213efcba31c3904e7af210181a5a023293e075d7 Mon Sep 17 00:00:00 2001
From: Max <mxruan@163.com>
Date: Mon, 11 Dec 2023 16:14:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E5=90=8E=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=AD=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=98=B5=E7=A7=B0=E5=A4=B4=E5=83=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../avroom/presenter/RoomManagerPresenter.java | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomManagerPresenter.java b/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomManagerPresenter.java
index 1daa26851..26bc0de49 100644
--- a/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomManagerPresenter.java
+++ b/app/src/main/java/com/yizhuan/erban/avroom/presenter/RoomManagerPresenter.java
@@ -70,10 +70,20 @@ public class RoomManagerPresenter extends BaseMvpPresenter<IRoomManagerView> {
                                 Iterator<ChatRoomMember> iterator = paramList.iterator();
                                 while (iterator.hasNext()) {
                                     ChatRoomMember member = iterator.next();
-                                    if (member != null
-                                            && !TextUtils.isEmpty(member.getAccount())
-                                            && map.containsKey(member.getAccount())) {
-                                        iterator.remove();
+                                    if (member != null && !TextUtils.isEmpty(member.getAccount())) {
+                                        if (map.containsKey(member.getAccount())) {
+                                            iterator.remove();
+                                        } else {
+                                            if (member.getNick() == null || member.getAvatar() == null) {
+                                                for (UserInfo info : userInfos) {
+                                                    if (String.valueOf(info.getUid()).equals(member.getAccount())) {
+                                                        member.setNick(info.getNick());
+                                                        member.setAvatar(info.getAvatar());
+                                                        break;
+                                                    }
+                                                }
+                                            }
+                                        }
                                     }
                                 }
                                 return paramList;