From 332fc19dd09caa546876785c853b2508fc4995e5 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Sat, 8 Feb 2025 15:50:50 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3345:=20=E7=A7=BB=E9=99=A4=E7=BE=A4?=
 =?UTF-8?q?=E6=88=90=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../im/channel/netease/dto/NimGroupInfo.java   | 18 +++++++-----------
 .../im/group/member/GroupMemberSyncer.java     |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/im-center-server/src/main/java/cn/axzo/im/channel/netease/dto/NimGroupInfo.java b/im-center-server/src/main/java/cn/axzo/im/channel/netease/dto/NimGroupInfo.java
index 3ccc96b..b0d16d6 100644
--- a/im-center-server/src/main/java/cn/axzo/im/channel/netease/dto/NimGroupInfo.java
+++ b/im-center-server/src/main/java/cn/axzo/im/channel/netease/dto/NimGroupInfo.java
@@ -19,18 +19,14 @@ public class NimGroupInfo {
     private Set<NimGroupMemberInfo> members;
 
     @JSONField(serialize = false, deserialize = false)
-    public Set<NimGroupMemberInfo> getOwnerAndMembers() {
-        HashSet<NimGroupMemberInfo> ownerAndMembers = new HashSet<>();
-        ownerAndMembers.add(owner);
+    public Set<NimGroupMemberInfo> getPeople() {
+        HashSet<NimGroupMemberInfo> people = new HashSet<>();
+        people.add(owner);
         if (admins != null)
-            ownerAndMembers.addAll(admins);
-        if (members != null)
-            ownerAndMembers.addAll(members);
-        return ownerAndMembers;
-    }
-
-    public int memberCount() {
-        return getOwnerAndMembers().size();
+            people.addAll(admins);
+        if (this.members != null)
+            people.addAll(this.members);
+        return people;
     }
 
 }
\ No newline at end of file
diff --git a/im-center-server/src/main/java/cn/axzo/im/group/member/GroupMemberSyncer.java b/im-center-server/src/main/java/cn/axzo/im/group/member/GroupMemberSyncer.java
index c056b05..ab04890 100644
--- a/im-center-server/src/main/java/cn/axzo/im/group/member/GroupMemberSyncer.java
+++ b/im-center-server/src/main/java/cn/axzo/im/group/member/GroupMemberSyncer.java
@@ -86,7 +86,7 @@ public class GroupMemberSyncer {
         Set<NimGroupMemberInfo> admins = groupInfo.getAdmins();
         if (admins == null)
             admins = Collections.emptySet();
-        for (NimGroupMemberInfo member : groupInfo.getOwnerAndMembers()) {
+        for (NimGroupMemberInfo member : groupInfo.getPeople()) {
             PersonAccountAttribute person = ImAccountParser
                     .parsePerson(member.getAccid())
                     .orElse(robot());