fix:87840

laws-module-system/src/main/java/com/jero/modules/message/handle/ISendMsgHandle.java

@@ -2,5 +2,5 @@ package com.jero.modules.message.handle;
 
 public interface ISendMsgHandle {
 
-	void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage);
+	void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage,String sendUser);
 }

laws-module-system/src/main/java/com/jero/modules/message/handle/impl/EmailSendMsgHandle.java

@@ -18,7 +18,7 @@ public class EmailSendMsgHandle implements ISendMsgHandle {
     }
 
     @Override
-    public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage) {
+    public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage,String senUser) {
         JavaMailSender mailSender = (JavaMailSender) SpringContextUtils.getBean("mailSender");
         MimeMessage message = mailSender.createMimeMessage();
         MimeMessageHelper helper = null;

laws-module-system/src/main/java/com/jero/modules/message/handle/impl/SmsSendMsgHandle.java

@@ -5,18 +5,23 @@ import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.SpringContextUtils;
 import com.jero.common.util.UUIDUtils;
 import com.jero.modules.system.entity.SysAnnouncement;
+import com.jero.modules.system.entity.SysUser;
 import com.jero.modules.system.service.ISysAnnouncementService;
+import com.jero.modules.system.service.ISysUserService;
 import lombok.extern.slf4j.Slf4j;
 import com.jero.modules.message.handle.ISendMsgHandle;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 
+import javax.annotation.Resource;
 import java.util.Date;
 
 @Slf4j
 public class SmsSendMsgHandle implements ISendMsgHandle {
 
+
 	@Override
-	public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage) {
+	public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage,String sendUser) {
 		ISysAnnouncementService bean = SpringContextUtils.getBean(ISysAnnouncementService.class);
 		String id = UUIDUtils.randomUUID20();
 		SysAnnouncement sysAnnouncement = new SysAnnouncement();
@@ -24,13 +29,20 @@ public class SmsSendMsgHandle implements ISendMsgHandle {
 		sysAnnouncement.setTitile(esTitle);
 		sysAnnouncement.setMsgContent(esContent);
 
-		try {
-			LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
-			sysAnnouncement.setSender(loginUser.getRealname() + "(" + loginUser.getUsername() + ")");
-		} catch (Exception e) {
-			sysAnnouncement.setSender("");
+		if(StringUtils.isEmpty(sendUser)){
+			try {
+				LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+				sysAnnouncement.setSender(loginUser.getRealname() + "(" + loginUser.getUsername() + ")");
+			} catch (Exception e) {
+				sysAnnouncement.setSender("");
+			}
+		}else{
+			ISysUserService sysUserService = SpringContextUtils.getBean(ISysUserService.class);
+			SysUser sysUser = sysUserService.getById(sendUser);
+			sysAnnouncement.setSender(sysUser.getRealname() + "(" + sysUser.getUsername() + ")");
 		}
 
+
 		sysAnnouncement.setMsgCategory("2");
 		sysAnnouncement.setMsgType("USER");
 		sysAnnouncement.setSendStatus("1");

laws-module-system/src/main/java/com/jero/modules/message/handle/impl/WxSendMsgHandle.java

@@ -6,7 +6,7 @@ import com.jero.modules.message.handle.ISendMsgHandle;
 public class WxSendMsgHandle implements ISendMsgHandle {
 
 	@Override
-	public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage) {
+	public void SendMsg(String esReceiver, String esTitle, String esContent, String openType, String openPage,String sendUser) {
 		// TODO Auto-generated method stub
 		log.info("发微信消息模板");
 	}

laws-module-system/src/main/java/com/jero/modules/system/controller/job/SendMsgJob.java

@@ -58,7 +58,7 @@ public class SendMsgJob implements Job {
 					throw new NullPointerException();
 				}
 				sendMsgHandle.SendMsg(sysMessage.getEsReceiver(), sysMessage.getEsTitle(),
-						sysMessage.getEsContent(), null, null);
+						sysMessage.getEsContent(), null, null,null);
 				// 发送消息成功
 				sysMessage.setEsSendStatus(SendMsgStatusEnum.SUCCESS.getCode());
 			} catch (Exception e) {

laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java

@@ -1050,7 +1050,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 	@Override
 	public void sendEmailMsg(String email, String title, String content) {
 			EmailSendMsgHandle emailHandle=new EmailSendMsgHandle();
-			emailHandle.SendMsg(email, title, content, null, null);
+			emailHandle.SendMsg(email, title, content, null, null,null);
 	}
 
 	/**