diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java index 170f988a..5ce3880b 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/system/controller/SystemSendMessageController.java @@ -28,6 +28,7 @@ import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import net.sf.saxon.om.Item; import org.apache.commons.collections.CollectionUtils; +import org.apache.shiro.SecurityUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.BeanUtils; import org.springframework.core.env.Environment; @@ -83,12 +84,14 @@ public class SystemSendMessageController { @Transactional public Result sendAllUserMessage(@RequestParam("content") String content, @RequestParam("deadline") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date deadline) { + LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); List listPayContactsManagement = payContactsManagementService.list(); if(!CollectionUtils.isEmpty(listPayContactsManagement)){ SysAnnouncement announcement = new SysAnnouncement(); announcement.setTitile(ProjectCommon.ALERT12); announcement.setMsgContent(content); - announcement.setSender(env.getProperty("message.systemEmailUser")); + //announcement.setSender(env.getProperty("message.systemEmailUser")); + announcement.setSender(loginUser.getRealname()); announcement.setPriority(CommonConstant.PRIORITY_M); announcement.setMsgType(CommonConstant.MSG_TYPE_UESR); announcement.setSendStatus(CommonConstant.HAS_SEND);