From 3166fa8c208d2e6e8d0e08e1685acc331c368e6d Mon Sep 17 00:00:00 2001 From: xudawei Date: Mon, 16 Dec 2024 10:29:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:(REQ-3201)=20=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E6=9B=B4=E6=96=B0-=E7=B1=BB=E5=88=AB=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/domain/param/MessageTemplateV3SaveOrUpdateParam.java | 1 + 1 file changed, 1 insertion(+) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateV3SaveOrUpdateParam.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateV3SaveOrUpdateParam.java index 6c4141fc..0f3d6394 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateV3SaveOrUpdateParam.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/domain/param/MessageTemplateV3SaveOrUpdateParam.java @@ -288,6 +288,7 @@ public class MessageTemplateV3SaveOrUpdateParam implements Serializable { .templateName(request.getTemplateName()) .detailStyleCode(request.getDetailStyleCode()) .operatorName(request.getOperatorName()) + .msgCategory(detail.getSubCategory()) .updatePersonId(request.getOperatorId()) .updatePersonName(request.getOperatorName()) .createPersonId(detail.getCreatePersonId()) From 60f8b598e15c19f61c42eb4abe0ea731dcd65efa Mon Sep 17 00:00:00 2001 From: xudawei Date: Mon, 16 Dec 2024 10:52:47 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:(REQ-3201)=20=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E6=9B=B4=E6=96=B0-=E5=8E=9F=E6=9C=89=E6=8E=A8=E9=80=81?= =?UTF-8?q?=E7=BB=88=E7=AB=AF/=E6=9C=80=E4=BD=8E=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../message/service/impl/MessageTemplateV3ServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java index d9987bf0..5260bafa 100644 --- a/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java +++ b/inside-notices/src/main/java/cn/axzo/msg/center/message/service/impl/MessageTemplateV3ServiceImpl.java @@ -386,7 +386,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service { .eq(MessageTemplateV3::getIsDelete, TableIsDeleteEnum.NORMAL.value) .set(StringUtils.isNotBlank(param.getTemplateName()), MessageTemplateV3::getName, param.getTemplateName()) - .set(MessageTemplateV3::getPushTerminal, JSON.toJSONString(param.getPushTerminals())) + .set(CollectionUtils.isNotEmpty(param.getPushTerminals()), MessageTemplateV3::getPushTerminal, JSON.toJSONString(param.getPushTerminals())) .set(StringUtils.isNotBlank(param.getTitle()), MessageTemplateV3::getTitle, param.getTitle()) // .set(MessageBaseTemplate::getCardContent, JSONObjectUtil.toJSONString(param.getMsgCardContentItems())) .set(MessageTemplateV3::getContent, param.getContent()) @@ -399,7 +399,7 @@ public class MessageTemplateV3ServiceImpl implements MessageTemplateV3Service { .set(MessageTemplateV3::getUpdatePersonId, param.getOperatorId()) .set(MessageTemplateV3::getUpdatePersonName, param.getOperatorName()) .set(MessageTemplateV3::getIcon, param.getIcon()) - .set(MessageTemplateV3::getMinAppVersion, param.getMinAppVersion()) + .set(StringUtils.isNotBlank(param.getMinAppVersion()), MessageTemplateV3::getMinAppVersion, param.getMinAppVersion()) .set(Objects.nonNull(pushData), MessageTemplateV3::getPushData, pushData == null ? null : pushData.toJSONString()) //推送终端/最低版本