Commit 55a5d561 by 罗长华

修复NPE

parent 9a79ae97
......@@ -697,19 +697,24 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
// 发送消息
for (ImConversationMembers members : membersList) {
try {
if (members.getClientId().equals(senderClientId) && !param.getIncludeSender()) {
// 是否是发送者 且includeSender不为true
continue;
}
// 入库 保存收件箱
saveImInbox(application, conversation.getId(), imMessageOnlineSend.getMsgId(),
members, SnowflakeUtil.getId());
// 在线用户直接发消息
sendMsgForOnline(members.getFkClientId(), imMessageOnlineSend);
} catch (Exception e) {
log.info("");
}
// 离线消息推送
pushMsgToOfflineMembers(application, members, param.getPushContent(), param.getPushExt());
// // 入库 保存收件箱
// saveImInbox(application, conversation.getId(), imMessageOnlineSend.getMsgId(),
// members, SnowflakeUtil.getId());
//
// // 在线用户直接发消息
// sendMsgForOnline(members.getFkClientId(), imMessageOnlineSend);
//
// // 离线消息推送
// pushMsgToOfflineMembers(application, members, param.getPushContent(), param.getPushExt());
}
});
......@@ -832,9 +837,9 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
receiverMember.setFkConversationId(conversation.getId());
ImConversationMembers creatorMember = new ImConversationMembers();
receiverMember.setClientId(sender.getClientId());
receiverMember.setFkClientId(sender.getId());
receiverMember.setFkConversationId(conversation.getId());
creatorMember.setClientId(sender.getClientId());
creatorMember.setFkClientId(sender.getId());
creatorMember.setFkConversationId(conversation.getId());
List<ImConversationMembers> conversationMembers = new ArrayList<>();
conversationMembers.add(receiverMember);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment