From b5cbb527175258b217a7d756092f0eb90a4e4d05 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Thu, 3 Nov 2022 14:49:07 +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=AF=84=E8=AE=BA=E6=B6=88=E6=81=AF=E6=B7=BB=E5=8A=A0=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...blemKnowledgeBaseCommentEOServiceImpl.java | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java
index a5a6e52ac..82050c16a 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/problemKnowledgeBase/service/impl/ProblemKnowledgeBaseCommentEOServiceImpl.java
@@ -88,28 +88,33 @@ public class ProblemKnowledgeBaseCommentEOServiceImpl extends ServiceImpl<Proble
 		String createBy = problemKnowledgeBaseEO.getCreateBy();
 		//自己回复的时候不发消息
 //		if(!loginUser.getUsername().equals(createBy)){
-			SysUser sysUser = sysUserService.getUserByName(createBy);
-			String contentCNNo = "您发布的问题知识库信息"+problemKnowledgeBaseEO.getTitle()+"有新评论,请注意查看.";
-			String contentENNo = "In the Q&A knowledge "+problemKnowledgeBaseEO.getTitle()+" you created, a new comment has been added. Please be reminded to check it out.";
+		SysUser sysUser = sysUserService.getUserByName(createBy);
+		String contentCNNo = "您发布的问题知识库信息"+problemKnowledgeBaseEO.getTitle()+"有新评论,请注意查看.";
+		String contentENNo = "In the Q&A knowledge "+problemKnowledgeBaseEO.getTitle()+" you created, a new comment has been added. Please be reminded to check it out.";
+		String url = backUrl +"/problemknowledgeBase";
 
-			//发送消息(站内和飞书)
+		String href = "<a href='"+url + "'"+ " target='_blank'>"+ problemKnowledgeBaseEO.getTitle() + "</a>";
+		String contentINfoCNNo = "您发布的问题知识库信息"+href+"有新评论,请注意查看.";
+		String contentInfoENNo = "In the Q&A knowledge "+href+" you created, a new comment has been added. Please be reminded to check it out.";
+
+		//发送消息(站内和飞书)
 			//您发布的问题知识库信息XXXXXXXX有新评论，请注意查看。
 			//In the Q&A knowledge xxxxxxxx you created, a new comment has been added. Please be reminded to check it out.
 			SysAnnouncement sysAnnouncement = bussDocumentLibraryEOService.getSysAnnouncement(Arrays.asList(sysUser.getId().split(",")),
 					"msgTitle",
 					contentENNo,
-					contentENNo,
+					contentInfoENNo,
 					MessageTypeEnum.PUSH.getValue(),
 					MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName(),
 					contentCNNo,
-					contentCNNo);
+					contentINfoCNNo);
 			this.sysAnnouncementService.saveAnnouncement(sysAnnouncement);
 			bussDocumentLibraryEOService.sendWebsocket(com.jero.modules.system.util.StringUtils.join(sysUser.getThirdId(), ","), sysUser.getThirdId());
 
-            String href = backUrl +"/problemknowledgeBase";
+//            String href = backUrl +"/problemknowledgeBase";
 			FeishuMsgVo feishuMsgVo = new FeishuMsgVo();
 			feishuMsgVo.setTitle(MessageTypeEnum.PUSH.getNameCn()+"/"+MessageTypeEnum.PUSH.getName());
-			feishuMsgVo.setUrl(href);
+			feishuMsgVo.setUrl(url);
 			feishuMsgVo.setContentEn(contentENNo);
 			feishuMsgVo.setContent(contentCNNo);