群主转让、群注销

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -572,10 +572,13 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
                             for (ImGroupMemberWrapper.ImGroupMember member : entry.getValue()) {
 //                                member.setAvatar(avatarMap.getOrDefault(member.getUserId().intValue(), ""));
                                 SysUser user = teacherDao.getUser(member.getUserId().intValue());
-
                                 // 用户头像
                                 member.setAvatar(sysUserService.getImAvatar(user));
-                                member.setNickname(sysUserService.getImName(user));
+                                if(StringUtils.isNotEmpty(member.getRoleType())){
+                                    member.setNickname(StringUtils.isEmpty(user.getRealName())?user.getUsername():user.getRealName());
+                                }else {
+                                    member.setNickname(StringUtils.isEmpty(user.getUsername())?user.getRealName():user.getUsername());
+                                }
                             }
                             // 腾讯云用户加群
                             imGroupCoreService.groupMemberJoin(entry.getKey(), entry.getValue());

mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupMemberServiceImpl.java

@@ -494,7 +494,11 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 						if (user != null) {
 							// 用户头像
 							item.setAvatar(sysUserService.getImAvatar(user));
-							item.setNickname(sysUserService.getImName(user));
+							if(StringUtils.isNotEmpty(item.getRoleType())){
+								item.setNickname(StringUtils.isEmpty(user.getRealName())?user.getUsername():user.getRealName());
+							}else {
+								item.setNickname(StringUtils.isEmpty(user.getUsername())?user.getRealName():user.getUsername());
+							}
 						}
 					}
 					// 腾讯云IM用户加群