From c955e50d12e41cac6ddeadadd40e0b20b3e0824a Mon Sep 17 00:00:00 2001
From: xsx <825657193@qq.com>
Date: Tue, 20 Feb 2024 09:43:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B6=88=E6=81=AF=E4=B8=80=E7=9B=B4?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../implatform/service/impl/GroupMessageServiceImpl.java  | 8 ++++++--
 .../service/impl/PrivateMessageServiceImpl.java           | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
index d64243a..b785de9 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java
@@ -206,12 +206,16 @@ public class GroupMessageServiceImpl extends ServiceImpl<GroupMessageMapper, Gro
         if(!imClient.isOnline(session.getUserId())){
             throw new GlobalException(ResultCode.PROGRAM_ERROR, "网络连接失败，无法拉取离线消息");
         }
-        // 开启加载中标志
-        this.sendLoadingMessage(true);
+
         // 查询用户加入的群组
         List<GroupMember> members = groupMemberService.findByUserId(session.getUserId());
         Map<Long, GroupMember> groupMemberMap = CollStreamUtil.toIdentityMap(members, GroupMember::getGroupId);
         Set<Long> groupIds = groupMemberMap.keySet();
+        if(CollectionUtil.isEmpty(groupIds)){
+            return;
+        }
+        // 开启加载中标志
+        this.sendLoadingMessage(true);
         // 只能拉取最近1个月的,最多拉取1000条
         Date minDate = DateUtils.addMonths(new Date(), -1);
         LambdaQueryWrapper<GroupMessage> wrapper = Wrappers.lambdaQuery();
diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
index d6efd8f..0d9c2e3 100644
--- a/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
+++ b/im-platform/src/main/java/com/bx/implatform/service/impl/PrivateMessageServiceImpl.java
@@ -182,13 +182,14 @@ public class PrivateMessageServiceImpl extends ServiceImpl<PrivateMessageMapper,
         if(!imClient.isOnline(session.getUserId())){
             throw new GlobalException(ResultCode.PROGRAM_ERROR, "网络连接失败，无法拉取离线消息");
         }
-        // 开启加载中标志
-        this.sendLoadingMessage(true);
+
         // 查询用户好友列表
         List<Friend> friends = friendService.findFriendByUserId(session.getUserId());
         if (friends.isEmpty()) {
             return;
         }
+        // 开启加载中标志
+        this.sendLoadingMessage(true);
         List<Long> friendIds = friends.stream().map(Friend::getFriendId).collect(Collectors.toList());
         // 获取当前用户的消息
         LambdaQueryWrapper<PrivateMessage> queryWrapper = Wrappers.lambdaQuery();