From 1faec7b1df53678ed4df69057f8d1f6f76eb02ce Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Mon, 31 Oct 2022 10:13:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E7=9F=A5=E8=AF=86=E5=BA=93?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=91=E6=8E=A8=E9=80=81--=E5=8F=91=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProblemKnowledgeBaseEOServiceImpl.java    | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
index 79bbdb54d..81cdbe91c 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseEOServiceImpl.java
@@ -881,8 +881,24 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 				+ "'>" + " View details" + "</a>";
 		String contentInfo = msgContentEN + " " + href;
 
+
+		String ContentENNo = currentUser.getUsername()+" shared " + problemKnowledgeBaseTitle + " with you.Please be reminded to check it out.";
+		String ContentInfoENYes = currentUser.getUsername()+" shared " + problemKnowledgeBaseTitle + " with you.Please be reminded to check it out."+ " " + href;
+
+		String contentCnNo = currentUser.getUsername()+"向您分享了"+problemKnowledgeBaseTitle+",请查看.";
+		String contentInfoCnYes = currentUser.getUsername()+"向您分享了"+problemKnowledgeBaseTitle+",请查看"+ " " + href;
+
+
 		//封装消息的实体类
-		SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList, msgTitle, msgContentEN, contentInfo,MessageTypeEnum.PUSH.getValue(),MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName());
+		SysAnnouncement sysAnnouncement = getSysAnnouncement(userIdList,
+				msgTitle,
+				ContentENNo,
+				ContentInfoENYes,
+				MessageTypeEnum.PUSH.getValue(),
+				MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(),
+				contentCnNo,
+				contentInfoCnYes);
+
 		this.sysAnnouncementService.saveAnnouncement(sysAnnouncement);
 		this.sendWebsocket(StringUtils.join(thirdIdList, ","), contentInfo);
 		//飞书
@@ -922,7 +938,9 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 											  String content,
 											  String contentInfo,
 											  String messageType,
-											  String initiator) {
+											  String initiator,
+											  String contentCn,
+											  String contentInfoCn) {
 		SysAnnouncement sysAnnouncement = new SysAnnouncement();
 		sysAnnouncement.setInitiator(initiator);
 		sysAnnouncement.setDelFlag("0");
@@ -934,6 +952,8 @@ public class ProblemKnowledgeBaseEOServiceImpl extends ServiceImpl<ProblemKnowle
 		sysAnnouncement.setMsgContent(content);
 		sysAnnouncement.setMsgContentInfo(contentInfo);
 		sysAnnouncement.setUserIds(StringUtils.join(userIdList, ","));
+		sysAnnouncement.setMsgContentCn(contentCn);
+		sysAnnouncement.setMsgContentInfoCn(contentInfoCn);
 		return sysAnnouncement;
 	}
 }