|
@@ -282,8 +282,13 @@ public class ImGroupServiceImpl extends ServiceImpl<ImGroupDao, ImGroup> impleme
|
|
|
// 自动加入该群组
|
|
|
imGroupMemberService.join(Lists.newArrayList(new GroupMember(imIdentity, groupId, null)), groupId);
|
|
|
|
|
|
+ Integer numbers = imGroupMemberService.lambdaQuery()
|
|
|
+ .eq(ImGroupMember::getGroupId, groupId)
|
|
|
+ .eq(ImGroupMember::getUserId, userId)
|
|
|
+ .eq(ImGroupMember::getIsAdmin, true)
|
|
|
+ .count();
|
|
|
// 拥有老师身份,且非群主时,需要主动退出群聊
|
|
|
- if (count > 0 && !groupMember.getIsAdmin()) {
|
|
|
+ if (count > 0 && numbers <= 0) {
|
|
|
|
|
|
GroupModel groupModel = new GroupModel(groupId,0);
|
|
|
GroupMember[] groupMembers = new GroupMember[]{new GroupMember(String.valueOf(userId), groupId,null)};
|