From 66ed688f79a75308dccca3531a27fa74a76bb1c2 Mon Sep 17 00:00:00 2001
From: CD <1103614279@qq.com>
Date: Fri, 4 Nov 2022 09:11:20 +0800
Subject: [PATCH] bug62162

---
 ...ectTaskInventoryFeedbackEOServiceImpl.java | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
index 5d96f809a..96b769351 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectTaskInventoryFeedbackEOServiceImpl.java
@@ -477,13 +477,13 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 				//feishuMsgVo.setRegulationNo(projectLawsInventoryEO.getSerialNumber());
 				//feishuMsgVo.setProject(projectNameInfoEO.getProjectName() + "-" + projectYearNameInfoEO.getYearName() + " " + projectLibraryBaseInfo.getTargetMarket());
 
-				String initiator = "";
-				if (StringUtils.isNotEmpty(initiatorId)) {
-					QueryWrapper<SysUser> queryOneWrapper = new QueryWrapper<>();
-					queryOneWrapper.lambda().eq(SysUser::getId,initiatorId);
-					SysUser sysUser = this.sysUserService.getBaseMapper().selectOne(queryOneWrapper);
-					initiator = sysUser.getUsername();
-				}
+				//String initiator = "";
+				//if (StringUtils.isNotEmpty(initiatorId)) {
+				//	QueryWrapper<SysUser> queryOneWrapper = new QueryWrapper<>();
+				//	queryOneWrapper.lambda().eq(SysUser::getId,initiatorId);
+				//	SysUser sysUser = this.sysUserService.getBaseMapper().selectOne(queryOneWrapper);
+				//	initiator = sysUser.getUsername();
+				//}
 				//feishuMsgVo.setInitiator(initiator);
 
 				//MessageTypeEnum messageTypeEnum = null;
@@ -518,12 +518,12 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 
 					msgTitle = MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.DESIGN_COMPLIANCE_CONFIRMATION.getEn();
-					cnContentUpper = "您好，"+ initiator +"向您提交了工程交付信息，请及时查看处理";
+					cnContentUpper = "您好，"+ currentUser.getUsername() +"向您提交了工程交付信息，请及时查看处理";
 					cnContentLower = "项目: " + projectName +
 							"\n法规: " + LAW_CN +
 							"\n发起人: " + currentUser.getUsername() +
 							"\n截止时间: " + sdf.format(projectLawsInventoryEO.getDesignDueDate());
-					enContentUpper = "Hello! "+ initiator +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner";
+					enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner";
 					enContentLower = "Project: " + projectName +
 							"\nRegulation No: " + LAW_EN +
 							"\nInitiator: " + currentUser.getUsername() +
@@ -542,12 +542,12 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 
 					msgTitle = MessageType2Enum.PRE_HOMO_CONFIRMATION.getCn() + "/" + MessageType2Enum.PRE_HOMO_CONFIRMATION.getEn();
-					cnContentUpper = "您好，"+ initiator +"向您提交了工程交付信息，请及时查看处理";
+					cnContentUpper = "您好，"+ currentUser.getUsername() +"向您提交了工程交付信息，请及时查看处理";
 					cnContentLower = "项目: " + projectName +
 							"\n法规: " + LAW_CN +
 							"\n发起人: " + currentUser.getUsername() +
 							"\n截止时间: " + sdf.format(projectLawsInventoryEO.getPrehomoDueDate());
-					enContentUpper = "Hello! "+ initiator +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner";
+					enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner";
 					enContentLower = "Project: " + projectName +
 							"\nRegulation No: " + LAW_EN +
 							"\nInitiator: " + currentUser.getUsername() +
@@ -566,12 +566,12 @@ public class ProjectTaskInventoryFeedbackEOServiceImpl extends ServiceImpl<Proje
 					//messageTypeEnum = MessageTypeEnum.COMPLIANCE_CONFIRMATION;
 
 					msgTitle = MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getCn() + "/" + MessageType2Enum.VALIDATION_COMPLIANCE_CONFIRMATION.getEn();
-					cnContentUpper = "您好，"+ initiator +"向您提交了工程交付信息，请及时查看处理";
+					cnContentUpper = "您好，"+ currentUser.getUsername() +"向您提交了工程交付信息，请及时查看处理";
 					cnContentLower = "项目: " + projectName +
 							"\n法规: " + LAW_CN +
 							"\n发起人: " + currentUser.getUsername() +
 							"\n截止时间: " + sdf.format(projectLawsInventoryEO.getVerifyDueDate());
-					enContentUpper = "Hello! "+ initiator +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner";
+					enContentUpper = "Hello! "+ currentUser.getUsername() +" has submitted the engineering deliverable information to you. Please check and address the task in a timely manner";
 					enContentLower = "Project: " + projectName +
 							"\nRegulation No: " + LAW_EN +
 							"\nInitiator: " + currentUser.getUsername() +