From cc54e5dcaaa2f8b6a0c6c3e8b84b23ef2b4f0506 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Wed, 2 Nov 2022 17:56:11 +0800
Subject: [PATCH] bug

---
 .../service/impl/LawsOpinionGatherEOServiceImpl.java     | 6 ++----
 .../java/com/jero/modules/project/job/TaskAffirmJob.java | 2 +-
 .../service/impl/ProjectLawsInventoryEOServiceImpl.java  | 9 +++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
index c4ca69f25..2d490d9f3 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/lawsOpinionGather/service/impl/LawsOpinionGatherEOServiceImpl.java
@@ -360,13 +360,11 @@ public class LawsOpinionGatherEOServiceImpl extends ServiceImpl<LawsOpinionGathe
 			cnContentUpper = "您好，该任务将于3天后到期，请及时查看处理，谢谢！";
 			cnContentLower = "编号: " + lawsOpinionGatherEO.getSerialNumber() +
 					"\n标题: " + lawsOpinionGatherEO.getTitle() +
-					"\n发起人: 系统通知" +
-					"\n截止时间: " + endTime;
+					"\n发起人: 系统通知" ;
 			enContentUpper = "Hello! This task will expire in 3 days. Please check and address the task in a timely manner. Thank you!";
 			enContentLower = "Regulation No: " + lawsOpinionGatherEO.getSerialNumber() +
 					"\nTitle: " + bussDocumentLibraryEO.getTitleEn() +
-					"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() +
-					"\nDue Date: " + endTime;
+					"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName();
 
 		} else if (StringUtils.equals(msgType, MsgTypeEnum.LAWS_OPOMOPM_GATHER_ENALUATOR_EXPIRE_REMIND_TODAY_MSG.getValue())){
 			userIdList = (List<String>) jsonObject.get("userIdList");
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java
index c12b42c6b..a865ab379 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/job/TaskAffirmJob.java
@@ -157,7 +157,7 @@ public class TaskAffirmJob implements Job {
                     //飞书跳转链接
 
                     String hrefFeishu = backUrl
-                            + JumpLinkEnum.TASK_AFFIRM_LINK.getLink();
+                            + "/projectRegulationTasks";
 
                     //项目名称
                     String projectVersion = (com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getParentId()) && com.jero.modules.system.util.StringUtils.isBlank(projectLibraryBase.getProjectVersion())) ? "00" : projectLibraryBase.getProjectVersion();
diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
index 1ee4f3151..27fc6c861 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java
@@ -8675,6 +8675,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 				new QueryWrapper<SysUser>().lambda().eq(SysUser::getId, projectLibraryBase.getStudioEngineer())
 		);
 
+		LoginUser currentUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
 		projectLawsInventoryEOList.forEach(projectLawsInventoryEO -> {
 
 			//如果清单确认状态为待确认的，进行催办
@@ -8753,11 +8754,11 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						feishuMsgVo.setTitle(MessageType2Enum.REGULATION_LIST_CONFIRMATION.getCn() + "/" + MessageType2Enum.REGULATION_LIST_CONFIRMATION.getEn());
 						feishuMsgVo.setCnContentUpper("您好，请尽快查看处理此项任务，谢谢！");
 						feishuMsgVo.setCnContentLower("项目: " + PRN +
-								"\n发起人: 系统通知" +
+								"\n发起人: " + currentUser.getUsername() +
 								"\n截止时间: " + dueDate);
 						feishuMsgVo.setEnContentUpper("Hello! Please check and address the task ASAP. Thank you!");
 						feishuMsgVo.setEnContentLower("Project: " + PRN +
-								"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() +
+								"\nInitiator: " + currentUser.getUsername() +
 								"\nDue Date: "+ dueDate);
 						feishuMsgVo.setUrl(hrefFeishu);
 						feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色
@@ -8840,12 +8841,12 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl<ProjectLawsIn
 						feishuMsgVo.setCnContentUpper("您好，请尽快查看处理此项任务，谢谢！");
 						feishuMsgVo.setCnContentLower("项目: " + PRN +
 								"\n法规: " + projectLawsInventoryEO.getSerialNumber() + " " + projectLawsInventoryEO.getTitle() +
-								"\n发起人: 系统通知" +
+								"\n发起人: " + currentUser.getUsername() +
 								"\n截止时间: " + dueDate);
 						feishuMsgVo.setEnContentUpper("Hello! Please check and address the task ASAP. Thank you!");
 						feishuMsgVo.setEnContentLower("Project: " + PRN +
 								"\nRegulation No: " + projectLawsInventoryEO.getSerialNumber() + " " + bussDocumentLibraryEO.getTitleEn() +
-								"\nInitiator: " + MessageTypeEnum.SYSTEMATIC_NOTIFICATION.getName() +
+								"\nInitiator: " + currentUser.getUsername() +
 								"\nDue Date: "+ dueDate);
 						feishuMsgVo.setUrl(hrefFeishu);
 						feishuMsgVo.setColor(MsgColorEnum.GREEN.getValue()); // 颜色