From 21cb9310c1a801be9b795c49de4940e3e5c79088 Mon Sep 17 00:00:00 2001
From: zhangyx <1254353766@qq.com>
Date: Mon, 25 Oct 2021 15:34:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E4=BA=BA=E5=8F=91=E9=80=81=E4=BA=BA=E5=90=8D=E7=BB=99?=
 =?UTF-8?q?=E5=9B=BA=E5=AE=9A=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BizSendMsgTemplateServiceImpl.java       | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java
index 14e038b..83c583d 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/bizshortmessageemail/service/impl/BizSendMsgTemplateServiceImpl.java
@@ -122,7 +122,7 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
         //发送短信
         result = msgService.sendMsg(msgVO);
         //保存日志
-        savaLog(msgInfo, result, receiver, magContent);
+        savaLog(msgInfo, result, receiver, magContent, taskForm);
         return result;
     }
 
@@ -132,10 +132,14 @@ public class BizSendMsgTemplateServiceImpl extends ServiceImpl<BizSendMsgTemplat
      * @param result
      * @param receiverVO
      */
-    public void savaLog(BizSendMsgInfo msgInfo, boolean result, BizReceiverVO receiverVO, String magContent) {
+    public void savaLog(BizSendMsgInfo msgInfo, boolean result, BizReceiverVO receiverVO, String magContent, String taskForm) {
         //当前用户userId
         String userId = cacheUserService.getCacheUser().getUserId();//"ex-wanghy623";
         String userName = cacheUserService.getCacheUser().getFullName();//"曹鹏";
+        if (StringUtils.equals("timing", taskForm)) {
+            userId = "system-timing-task";
+            userName = "系统定时任务";
+        }
         BizSendMsgLog msgLog = new BizSendMsgLog();
         String id = PropertyUtils.getSnowflakeId();
         msgLog.setId(id)