|
@@ -110,16 +110,17 @@ public class ImGroupController extends BaseController {
|
|
|
if (Objects.isNull(sysUser)) {
|
|
|
return failed(HttpStatus.FORBIDDEN, "请登录");
|
|
|
}
|
|
|
-
|
|
|
ImUserFriendDto dto = imUserFriendService.queryFriendDetail(sysUser.getId(), userId);
|
|
|
if (dto == null) {
|
|
|
dto = new ImUserFriendDto();
|
|
|
SysUser user = sysUserFeignService.queryUserById(userId);
|
|
|
dto.setFriend(user);
|
|
|
- if (user.getUserType().contains("TEACHER")) {
|
|
|
- dto.setFriendNickname(user.getRealName());
|
|
|
- } else {
|
|
|
+ //这里由原来的优先取老师的realName改成了优先取学员的username,
|
|
|
+ // 因为管理员在修改通讯录备注的时候,如果是多角色,优先改的是学员的username
|
|
|
+ if (user.getUserType().contains("STUDENT")) {
|
|
|
dto.setFriendNickname(user.getUsername());
|
|
|
+ } else {
|
|
|
+ dto.setFriendNickname(user.getRealName());
|
|
|
}
|
|
|
dto.setFriendId(userId);
|
|
|
}
|