单人消息推送是否包含自己调整

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

@@ -761,7 +761,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
 
         Map<Long, ImConversation> conversationMapGroupById = new HashMap<>();
         Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId = new HashMap<>();
-        beforePublishPrivateMessage(application, sender, toUserIdList, conversationMapGroupById, conMembersMapGroupByConId);
+        beforePublishPrivateMessage(application, sender, toUserIdList, conversationMapGroupById, conMembersMapGroupByConId, param.getIncludeSender());
         // 开始发送消息
         conversationMapGroupById.forEach((conversationId, conversation) -> {
             List<ImConversationMembers> membersList = conMembersMapGroupByConId.getOrDefault(conversationId,
@@ -810,7 +810,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
 
         Map<Long, ImConversation> conversationMapGroupById = new HashMap<>();
         Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId = new HashMap<>();
-        beforePublishPrivateMessage(application, sender, toUserIdList, conversationMapGroupById, conMembersMapGroupByConId);
+        beforePublishPrivateMessage(application, sender, toUserIdList, conversationMapGroupById, conMembersMapGroupByConId, param.getIncludeSender());
         // 开始发送消息
         conversationMapGroupById.forEach((conversationId, conversation) -> {
             List<ImConversationMembers> membersList = conMembersMapGroupByConId.getOrDefault(conversationId,
@@ -860,7 +860,7 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
             param.getConversationExt().setChatType(ChatTypeEnum.SYSTEM);
         }
         beforePublishPrivateMessage(application, sender, toUserIdList, param.getConversationExt(),
-                conversationMapGroupById, conMembersMapGroupByConId);
+                conversationMapGroupById, conMembersMapGroupByConId, false);
 
         // 开始发送消息
         conversationMapGroupById.forEach((conversationId, conversation) -> {
@@ -911,8 +911,8 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
                                              ImClient sender,
                                              List<String> toUserIdList,
                                              Map<Long, ImConversation> conversationMapGroupById,
-                                             Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId) {
-        this.beforePublishPrivateMessage(application, sender, toUserIdList, null, conversationMapGroupById, conMembersMapGroupByConId);
+                                             Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId, Boolean includeSender) {
+        this.beforePublishPrivateMessage(application, sender, toUserIdList, null, conversationMapGroupById, conMembersMapGroupByConId, includeSender);
     }
 
     /**
@@ -932,10 +932,12 @@ public class ImMessageServiceImpl extends BaseServiceImpl<ImMessageMapper, ImMes
                                              List<String> toUserIdList,
                                              ConversationExtParam conversationExt,
                                              Map<Long, ImConversation> conversationMapGroupById,
-                                             Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId) {
+                                             Map<Long, List<ImConversationMembers>> conMembersMapGroupByConId, Boolean includeSender) {
 
-        // 排除发件人自己
-        toUserIdList = toUserIdList.stream().filter(userId -> !sender.getClientId().equals(userId)).collect(Collectors.toList());
+        if (!includeSender) {
+            // 排除发件人自己
+            toUserIdList = toUserIdList.stream().filter(userId -> !sender.getClientId().equals(userId)).collect(Collectors.toList());
+        }
 
         Long appId = application.getId();
         // 获取收件人信息