From 47e7a0f5267d22fd73672b75af0b4f560713630f Mon Sep 17 00:00:00 2001 From: xudawei Date: Wed, 18 Dec 2024 20:42:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:(REQ-3201)=20=E6=B6=88=E6=81=AF=E6=A8=A1?= =?UTF-8?q?=E7=89=88=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91,=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E7=BB=88=E7=AB=AF/=E6=9C=80=E4=BD=8E=E7=89=88?= =?UTF-8?q?=E6=9C=AC#=E9=80=9A=E9=81=93#=E5=8D=A1=E7=89=87=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5#=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=8A=B6=E6=80=81=E6=88=B3=E4=B8=BA=E7=A9=BA=E5=88=99?= =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=B5=8B=E5=80=BC[]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../param/MessageTemplateV3SaveOrUpdateParam.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) 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 aec94361..202f3caf 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 @@ -21,6 +21,7 @@ import cn.axzo.msg.center.service.template.request.MessageTemplateV3DeleteReques import cn.axzo.msg.center.service.template.request.MessageTemplateV3UpdateRequest; import cn.axzo.msg.center.service.template.response.MessageTemplateV3DetailResponse; import cn.axzo.msg.center.utils.MessageTemplateCategoryUtil; +import com.alibaba.excel.util.StringUtils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import lombok.AllArgsConstructor; @@ -258,11 +259,11 @@ public class MessageTemplateV3SaveOrUpdateParam implements Serializable { .cardJump(request.getCardJump()) .pushData(request.getPushData()) .status(StatusEnum.ENABLE) - .appVersionConfigs(request.getAppVersionConfigs())//推送终端/最低版本 - .channels(request.getChannels())//消息通道:IM/待办 - .cardStyleCode(request.getCardStyleCode())//卡片样式编码 - .cardExtFields(request.getCardExtFields())//卡片样式扩展字段 - .stateImageConfigs(request.getStateImageConfigs())//配置状态戳 + .appVersionConfigs(CollectionUtils.isNotEmpty(request.getAppVersionConfigs()) ? request.getAppVersionConfigs() : Lists.newArrayList())//推送终端/最低版本 + .channels(CollectionUtils.isNotEmpty(request.getChannels()) ? request.getChannels() : Lists.newArrayList())//消息通道:IM/待办 + .cardStyleCode(StringUtils.isNotBlank(request.getCardStyleCode()) ? request.getCardStyleCode() : "")//卡片样式编码 + .cardExtFields(CollectionUtils.isNotEmpty(request.getCardExtFields()) ? request.getCardExtFields() : Lists.newArrayList())//卡片样式扩展字段 + .stateImageConfigs(CollectionUtils.isNotEmpty(request.getStateImageConfigs()) ? request.getStateImageConfigs() : Lists.newArrayList())//配置状态戳 .build(); } @@ -313,7 +314,7 @@ public class MessageTemplateV3SaveOrUpdateParam implements Serializable { //消息通道,IM/代办 .channels(CollectionUtils.isNotEmpty(request.getChannels()) ? request.getChannels() : Lists.newArrayList()) //卡片样式编码 - .cardStyleCode(request.getCardStyleCode()) + .cardStyleCode(StringUtils.isNotBlank(request.getCardStyleCode()) ? request.getCardStyleCode() : "") //卡片样式扩展字段 .cardExtFields(CollectionUtils.isNotEmpty(request.getCardExtFields()) ? request.getCardExtFields() : Lists.newArrayList()) //配置状态戳