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

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

@@ -1238,8 +1238,6 @@ public class ImConversationServiceImpl extends BaseServiceImpl<ImConversationMap
         content.put("operator", imClientSender.getClientId()); //操作的client ID
         content.put("operator", imClientSender.getClientId()); //操作的client ID
         content.put("passivityOperator", clientToConversation.getClientId()); //被操作的client ID
         content.put("passivityOperator", clientToConversation.getClientId()); //被操作的client ID
         imMessage.setContent(JsonUtils.encodeJson(content));
         imMessage.setContent(JsonUtils.encodeJson(content));
-
-        //  保存消息至消息表
         imMessage.setId(messageId);
         imMessage.setId(messageId);
         imMessage.setMsgType(MsgTypeEnum.INVITE_CLIENT_JOIN_CONVERSATION.getUriCode());
         imMessage.setMsgType(MsgTypeEnum.INVITE_CLIENT_JOIN_CONVERSATION.getUriCode());
         imMessage.setCreateTime(new Date());
         imMessage.setCreateTime(new Date());

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

@@ -194,6 +194,10 @@ public class ImInboxServiceImpl extends BaseServiceImpl<ImInboxMapper, ImInbox>
         for (Long msgId : msgIds) {
         for (Long msgId : msgIds) {
             // 查询该消息
             // 查询该消息
             ImMessage imMessageDb = imMessageService.getById(msgId);
             ImMessage imMessageDb = imMessageService.getById(msgId);
+            if (imMessageDb == null) {
+                log.info("查无消息内容： {}", msgId);
+                continue;
+            }
             // 根据会话id查询该会话所有成员
             // 根据会话id查询该会话所有成员
             List<ImConversationMembers> membersList = imConversationMembersService.list(
             List<ImConversationMembers> membersList = imConversationMembersService.list(
                     new QueryWrapper<ImConversationMembers>().lambda()
                     new QueryWrapper<ImConversationMembers>().lambda()

core/src/main/java/com/wecloud/im/vo/ConversationVo.java

@@ -54,7 +54,7 @@ public class ConversationVo implements Serializable {
     @ApiModelProperty("成员")
     @ApiModelProperty("成员")
     private String members;
     private String members;
 
 
-    @ApiModelProperty("会话属性，1：单聊，2：普通群，3：万人群")
+    @ApiModelProperty("会话属性，1：单聊，2：普通群，3：万人群 4：聊天室")
     private Integer chatType;
     private Integer chatType;
 
 
     @ApiModelProperty("群成员数")
     @ApiModelProperty("群成员数")