Merge remote-tracking branch 'origin/xiaohudou_20220427' into xiaohudou_20220427

core/src/main/java/com/wecloud/im/service/impl/ImMessageServiceImpl.java

@@ -501,6 +501,20 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
         Page<ImMessage> page = new PageInfo<>(param, OrderItem.desc(getLambdaColumn(ImMessage::getCreateTime)));
         Page<ImMessage> page = new PageInfo<>(param, OrderItem.desc(getLambdaColumn(ImMessage::getCreateTime)));
         ImClient currentClient = imClientService.getCurrentClient();
         ImClient currentClient = imClientService.getCurrentClient();
         param.setCurrentFkClientId(currentClient.getId());
         param.setCurrentFkClientId(currentClient.getId());
+        ImConversation imConversation = imConversationService.getById(param.getConversationId());
+        if (imConversation == null) {
+            return new Paging<>(null);
+        }
+        if (ChatTypeEnum.NORMAL_GROUP.getCode().equals(imConversation.getChatType())) {
+            // 普通群聊判断是否已被踢出群
+            List<ImConversationMembers> members = imConversationMembersService.list(
+                    new QueryWrapper<ImConversationMembers>().lambda()
+                            .eq(ImConversationMembers::getFkConversationId, param.getConversationId())
+                            .eq(ImConversationMembers::getClientId, currentClient.getClientId()));
+            if (CollectionUtils.isEmpty(members)) {
+                return new Paging<>(null);
+            }
+        }
         IPage<OfflineMsgDto> iPage = imMessageMapper.getHistoryMsgConversationId(page, param);
         IPage<OfflineMsgDto> iPage = imMessageMapper.getHistoryMsgConversationId(page, param);
 
 
         return new Paging<>(iPage);
         return new Paging<>(iPage);