From c50aaed95e3f9d8b4e2c56445b4cbeeaebfba056 Mon Sep 17 00:00:00 2001
From: xiejunyu <xjy19961127>
Date: Mon, 6 Jun 2022 14:41:51 +0800
Subject: [PATCH] =?UTF-8?q?bug53596=E8=99=9A=E6=8B=9F=E6=B8=85=E5=8D=95?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DummyInventoryBaseEOServiceImpl.java | 34 ++++++++++++-------
 .../impl/ProjectLibraryBaseServiceImpl.java   |  4 +++
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
index e8c28fb9f..8421d7d1e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/dummy/service/impl/DummyInventoryBaseEOServiceImpl.java
@@ -1084,22 +1084,32 @@ public class DummyInventoryBaseEOServiceImpl extends ServiceImpl<DummyInventoryB
                     //拼接维护清单的消息
                     contentInfo = setContentInfo(contentInfo, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null);
                     contentInfoTemp = setContentInfo(contentInfoTemp, baseDiff, infoDiffList, addSerialNumber, deleteSerialNumber,null);
-
+                    //封装消息的实体类
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+                    sysAnnouncementService.saveAnnouncement(sysAnnouncement);
+                    bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
+                    //飞书
+                    try {
+                        iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfoTemp, MessageTypeEnum.PUSH.getName(), href);
+                    } catch (IOException e) {
+                        log.error("飞书消息推送失败");
+                    }
                 }else{//撤回的消息
                     content = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
                     contentInfo = "The " + baseName + " virtual list you subscribed to has been withdrawn,please note.";
-                    contentInfoTemp = contentInfo;
-                }
-                //封装消息的实体类
-                SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
-                sysAnnouncementService.saveAnnouncement(sysAnnouncement);
-                bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
-                //飞书
-                try {
-                    iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfoTemp, MessageTypeEnum.PUSH.getName(), href);
-                } catch (IOException e) {
-                    log.error("飞书消息推送失败");
+
+                    //封装消息的实体类
+                    SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(userIdList, content, contentInfo);
+                    sysAnnouncementService.saveAnnouncement(sysAnnouncement);
+                    bussDocumentLibraryEOService.sendWebsocket(idTemp, contentInfo);
+                    //飞书
+                    try {
+                        iFeishuService.batchSendMessage(thirdIdList.toArray(new String[]{}), contentInfo, MessageTypeEnum.PUSH.getName(), null);
+                    } catch (IOException e) {
+                        log.error("飞书消息推送失败");
+                    }
                 }
+
             }
         }
     }
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
index 48c7b7b21..43c0981f3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
@@ -10,6 +10,7 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.modules.project.entity.ConditionAssessmentEO;
 import com.jero.modules.project.entity.ProjectLawsInventoryEO;
 import com.jero.modules.project.entity.ProjectLibraryBase;
+import com.jero.modules.project.entity.ProjectTaskInventoryEO;
 import com.jero.modules.project.enums.*;
 import com.jero.modules.project.mapper.ProjectLawsInventoryEOMapper;
 import com.jero.modules.project.mapper.ProjectLibraryBaseMapper;
@@ -79,6 +80,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
 	@Autowired
 	private ProjectNameInfoEOServiceImpl projectNameInfoEOService;
 
+	@Autowired
+	private ProjectLawsInventoryEOServiceImpl projectLawsInventoryEOService;
+
 	/**
 	 * 保存
 	 *