Merge branch 'online1' of http://git.dayaedu.com/yonge/mec into online1

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

@@ -72,7 +72,11 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 		imGroupMember.setRoleType(roleType);
 		imGroupMember.setUpdateTime(date);
 		imGroupMember.setUserId(userId);
-		imGroupMember.setNickname(StringUtils.isBlank(user.getUsername()) ? user.getRealName() : user.getUsername());
+		if (StringUtils.isBlank(roleType)) {
+			imGroupMember.setNickname(user.getRealName());
+		} else {
+			imGroupMember.setNickname(user.getRealName());
+		}
 
 		imGroupMemberDao.insert(imGroupMember);