Merge branch 'feature/1020-tencent-im' into test

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

@@ -334,9 +334,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             imGroupMemberDto.getUser().setUsername(imGroupMemberDto.getGroupNickname());
             imGroupMemberDto.setNickname(imGroupMemberDto.getGroupNickname());
             String roleType = imGroupMemberDto.getRoleType();
-            if (StringUtils.isEmpty(roleType)){
+            /*if (StringUtils.isEmpty(roleType)){
                 throw new BizException("roleType为空");
-            }
+            }*/
             //根据角色不同 配置imUserId
             if (EFriendRoleType.SCHOOLMASTER.getMsg().equals(roleType) ||
                     EFriendRoleType.ORCHESTRA_LEADER.getMsg().equals(roleType) ||
@@ -369,9 +369,9 @@ public class ImGroupServiceImpl extends BaseServiceImpl<String, ImGroup> impleme
             }
         }
         String roleType = imGroupMemberDto.getRoleType();
-        if (StringUtils.isEmpty(roleType)){
+        /*if (StringUtils.isEmpty(roleType)){
             throw new BizException("roleType为空");
-        }
+        }*/
 
         //根据角色不同 配置imUserId
         if (EFriendRoleType.SCHOOLMASTER.getMsg().equals(roleType) ||

mec-im/src/main/java/com/ym/service/Impl/GroupCoreServiceImpl.java

@@ -257,9 +257,9 @@ public class GroupCoreServiceImpl implements GroupCoreService {
             imGroupMemberDto.getUser().setUsername(imGroupMemberDto.getGroupNickname());
             imGroupMemberDto.setNickname(imGroupMemberDto.getGroupNickname());
             String roleType = imGroupMemberDto.getRoleType();
-            if (StringUtils.isEmpty(roleType)){
+            /*if (StringUtils.isEmpty(roleType)){
                 throw new BizException("roleType为空");
-            }
+            }*/
             //根据角色不同 配置imUserId
             if (EFriendRoleType.SCHOOLMASTER.getMsg().equals(roleType) ||
                     EFriendRoleType.ORCHESTRA_LEADER.getMsg().equals(roleType) ||
@@ -292,9 +292,9 @@ public class GroupCoreServiceImpl implements GroupCoreService {
             }
         }
         String roleType = imGroupMemberDto.getRoleType();
-        if (StringUtils.isEmpty(roleType)){
+        /*if (StringUtils.isEmpty(roleType)){
             throw new BizException("roleType为空");
-        }
+        }*/
 
         //根据角色不同 配置imUserId
         if (EFriendRoleType.SCHOOLMASTER.getMsg().equals(roleType) ||