From d46beba25ccb64a1047a98d642b6ce45e82f0bee Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 17 十月 2022 18:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java b/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
index 76639dc..2da8edd 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/factory/InnerSender.java
@@ -46,7 +46,9 @@
             //鐢熸垚8浣嶉殢鏈烘暟娑堟伅缂栫爜
             messageAdd.setMessageNumber(messageNumber);
             //鍙戦�佹椂闂�
-            messageAdd.setSendTime(new Date());
+            if (messageAdd.getSendTime() == null) {
+                messageAdd.setSendTime(new Date());
+            }
             //鐢熸垚榛樿鍙傛暟
             messageAdd.setCreateTime(new Date());
             messageAdd.setUpdateTime(new Date());
@@ -54,6 +56,7 @@
             messageAdd.setUpdateUser(messageParam.getCreateUser());
             messageAdd.setIsView(0);
             messageAdd.setVersion(0);
+            messageAdd.setIsScan(1);
             messages.add(messageAdd);
         }
         BeanUtils.copyProperties(messageParam, message);

--
Gitblit v1.8.0