diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/GroupAddMembersRequest.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/GroupAddMembersRequest.java index 7eb6fbc..bdf5408 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/GroupAddMembersRequest.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/GroupAddMembersRequest.java @@ -24,7 +24,7 @@ public class GroupAddMembersRequest { * 邀请者 */ @NotNull(message = "inviter不能为空") - private PersonAccountAttribute inviter; + private String inviter; /** * 群成员, 不包含群主. members数量不能超过199 diff --git a/im-center-server/src/main/java/cn/axzo/im/dao/repository/GroupMemberDao.java b/im-center-server/src/main/java/cn/axzo/im/dao/repository/GroupMemberDao.java index 704cf32..e44928d 100644 --- a/im-center-server/src/main/java/cn/axzo/im/dao/repository/GroupMemberDao.java +++ b/im-center-server/src/main/java/cn/axzo/im/dao/repository/GroupMemberDao.java @@ -22,6 +22,13 @@ import static java.util.stream.Collectors.toSet; @Repository("groupMemberDao") public class GroupMemberDao extends ServiceImpl { + public Optional findByAccount(Long tid, String imAccount) { + return lambdaQuery() + .eq(GroupMember::getTid, tid) + .eq(GroupMember::getImAccount, imAccount) + .oneOpt(); + } + public void deleteAccounts(Long tid) { lambdaUpdate() .eq(GroupMember::getTid, tid) diff --git a/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java b/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java index 6ecae5a..89f8167 100644 --- a/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java +++ b/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java @@ -142,7 +142,7 @@ public class GroupManager { return new GroupAddMembersResponse(); } GroupMember inviter = groupMemberDao - .findByPerson(group.getTid(), request.getInviter()) + .findByAccount(group.getTid(), request.getInviter()) .orElse(null); BizAssertions.assertNotNull(inviter, "邀请者不在群中"); //noinspection DataFlowIssue