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 | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 09593e7..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
@@ -37,15 +37,18 @@
Message message = new Message();
List<Message> messages = new ArrayList<>();
String[] ids = messageParam.getTargetTo().split(",");
+ String messageNumber = UtilNumber.getNumber("MC", 6);
for (String id : ids) {
Message messageAdd = new Message();
BeanUtils.copyProperties(messageParam, messageAdd);
//璁剧疆鎺ユ敹鑰�
messageAdd.setTargetTo(id);
//鐢熸垚8浣嶉殢鏈烘暟娑堟伅缂栫爜
- messageAdd.setMessageNumber(UtilNumber.getNumber("MC",6));
+ messageAdd.setMessageNumber(messageNumber);
//鍙戦�佹椂闂�
- messageAdd.setSendTime(new Date());
+ if (messageAdd.getSendTime() == null) {
+ messageAdd.setSendTime(new Date());
+ }
//鐢熸垚榛樿鍙傛暟
messageAdd.setCreateTime(new Date());
messageAdd.setUpdateTime(new Date());
@@ -53,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