Skip to content

Commit 2a10da6

Browse files
committed
更新 getGroupMembersForPortrait 接口,返回里面包含 name 信息
1 parent 5bc528f commit 2a10da6

File tree

3 files changed

+19
-18
lines changed

3 files changed

+19
-18
lines changed

src/main/java/cn/wildfirechat/app/ServiceImpl.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
import java.security.NoSuchAlgorithmException;
6464
import java.util.*;
6565
import java.util.concurrent.ConcurrentHashMap;
66-
import java.util.function.Supplier;
6766

6867
import static cn.wildfirechat.app.RestResult.RestCode.*;
6968
import static cn.wildfirechat.app.jpa.PCSession.PCSessionStatus.*;
@@ -1524,13 +1523,13 @@ public RestResult getGroupMembersForPortrait(String groupId) {
15241523
});
15251524
groupMembers = groupMembers.subList(0, 9);
15261525
}
1527-
List<UserIdPortraitPojo> mids = new ArrayList<>();
1526+
List<UserIdNamePortraitPojo> mids = new ArrayList<>();
15281527
for (PojoGroupMember member:groupMembers) {
15291528
IMResult<InputOutputUserInfo> userInfoIMResult = UserAdmin.getUserByUserId(member.getMember_id());
15301529
if(userInfoIMResult.getErrorCode() == ErrorCode.ERROR_CODE_SUCCESS) {
1531-
mids.add(new UserIdPortraitPojo(member.getMember_id(), userInfoIMResult.result.getPortrait()));
1530+
mids.add(new UserIdNamePortraitPojo(member.getMember_id(), userInfoIMResult.result.getDisplayName(), userInfoIMResult.result.getPortrait()));
15321531
} else {
1533-
mids.add(new UserIdPortraitPojo(member.getMember_id(), ""));
1532+
mids.add(new UserIdNamePortraitPojo(member.getMember_id(),"", ""));
15341533
}
15351534
}
15361535
return RestResult.ok(mids);
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package cn.wildfirechat.app.pojo;
2+
3+
public class UserIdNamePortraitPojo {
4+
public String userId;
5+
public String name;
6+
public String portrait;
7+
8+
public UserIdNamePortraitPojo() {
9+
}
10+
11+
public UserIdNamePortraitPojo(String userId, String name, String portrait) {
12+
this.userId = userId;
13+
this.name = name;
14+
this.portrait = portrait;
15+
}
16+
}

src/main/java/cn/wildfirechat/app/pojo/UserIdPortraitPojo.java

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)