From 07ebea63b53db64bf1e82155cf928870571a5baa Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Thu, 26 May 2022 18:19:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E5=BA=93=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BussDocumentLibraryEOServiceImpl.java        | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index c5ab2107c..d2b4aed2b 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -282,7 +282,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             //封装消息的实体类
             SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
-            sendWebsocket(StringUtils.join(serialNumberList, ","), StringUtils.join(serialNumberList, ","));
+            sendWebsocket(StringUtils.join(serialNumberList, ","), contentInfo);
         }
         //删除es
         try {
@@ -2047,7 +2047,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
             //封装消息的实体类
             SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
             sysAnnouncementService.saveAnnouncement(sysAnnouncement);
-            sendWebsocket(idTemp, idTemp);
+            sendWebsocket(idTemp, contentInfo);
             //飞书
             try {
                 iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), content, MessageTypeEnum.PUSH.getName(), hrefTemp);
@@ -2903,7 +2903,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
                 //封装消息的实体类
                 SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
                 sysAnnouncementService.saveAnnouncement(sysAnnouncement);
-                sendWebsocket((String) map.get("id"), (String) map.get("id"));
+                sendWebsocket((String) map.get("id"), contentInfo);
             }
             //飞书
             try {
@@ -2980,7 +2980,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //封装消息的实体类
         SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
-        sendWebsocket(StringUtils.join(serialNumberListTemp, ","), StringUtils.join(serialNumberListTemp, ","));
+        sendWebsocket(StringUtils.join(serialNumberListTemp, ","), contentInfo);
         //飞书
         try {
             for (String s : urlList) {
@@ -4405,6 +4405,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         //封装消息的实体类
         SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, content, contentInfo);
         sysAnnouncementService.saveAnnouncement(sysAnnouncement);
+        sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
         //飞书
         try {
             for (String s : urlList) {
@@ -4421,7 +4422,7 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
         } catch (IOException e) {
             log.error("飞书推送失败");
         }
-        sendWebsocket(documentIds, content);
+        sendWebsocket(documentIds, contentInfo);
         return "推送成功";
     }