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

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

@@ -581,6 +581,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 		ImGroupMember imGroupMember = imGroupMemberList.get(0);
 		imGroupMember.setGroupRoleType(null);
 		imGroupMember.setRoleType(roleType);
+		imGroupMember.setType(EFriendRoleType.getByName(roleType).name());
 		imGroupMember.setUpdateTime(date);
 		ImGroup group = imGroupDao.get(imGroupId);
 		if(!imGroupMember.getIsAdmin()){

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

@@ -197,6 +197,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
                     .builder()
                     .userId(userId.longValue())
                     .clientType("")
+                    .isAdmin(false)
                     .avatar(sysUserService.getImAvatar(sysUser))
                     .nickname(sysUserService.getImName(sysUser))
                     .roleType(roleType)