群主转让、群注销

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/ImGroupMember.java

@@ -109,8 +109,8 @@ public class ImGroupMember extends BaseEntity {
 
 	public void setRoleType(String roleType) {
 		this.roleType = roleType;
-		if(this.groupRoleType == null){
-			this.groupRoleType = StringUtils.isEmpty(roleType)? EImGroupRoleType.Admin.getCode():EImGroupRoleType.Member.getCode();
+		if(StringUtils.isEmpty(this.groupRoleType)){
+			this.groupRoleType = StringUtils.isEmpty(roleType)?EImGroupRoleType.Member.getCode():EImGroupRoleType.Admin.getCode();
 		}
 	}
 

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

@@ -155,11 +155,6 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 		imGroupMember.setRoleType(roleType);
 		imGroupMember.setUpdateTime(date);
 		imGroupMember.setUserId(userId);
-//		if (StringUtils.isBlank(roleType)) {
-//			imGroupMember.setNickname(user.getUsername()==null?user.getRealName():user.getUsername());
-//		} else {
-//			imGroupMember.setNickname(user.getRealName()==null?user.getUsername():user.getRealName());
-//		}
         SysUser user = teacherDao.getUser(userId);
         imGroupMember.setNickname(sysUserService.getImName(user));