From 17a11b6aec008905b64859348c3ab68df62965f6 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Tue, 12 Dec 2023 20:04:54 +0800 Subject: [PATCH] =?UTF-8?q?update=20-=20=E6=9B=B4=E6=96=B0=E5=BE=85?= =?UTF-8?q?=E5=8A=9E=E6=A8=A1=E6=9D=BF=E5=8F=96=E6=B6=88=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=20ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/core/common/utils/BpmnJsonConverterUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java index 94c04758a..83f6a1050 100644 --- a/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java +++ b/workflow-engine-core/src/main/java/cn/axzo/workflow/core/common/utils/BpmnJsonConverterUtil.java @@ -317,7 +317,7 @@ public final class BpmnJsonConverterUtil { noticeConfigElement.setName(CONFIG_NOTICE); // 通知消息模板配置 - if (Objects.nonNull(noticeConf.getNotice())) { + if (Objects.nonNull(noticeConf.getNotice()) || Objects.nonNull(noticeConf.getNotice().getNoticeMessageId())) { ExtensionElement noticeMessage = new ExtensionElement(); noticeMessage.setName(TEMPLATE_NOTICE_MESSAGE_ID); ExtensionAttribute noticeMessageAttribute = new ExtensionAttribute(); @@ -329,7 +329,7 @@ public final class BpmnJsonConverterUtil { } // 代办消息模板配置 - if (Objects.nonNull(noticeConf.getPending())) { + if (Objects.nonNull(noticeConf.getPending()) || Objects.nonNull(noticeConf.getPending().getPendingMessageId())) { ExtensionElement pendingMessage = new ExtensionElement(); pendingMessage.setName(TEMPLATE_PENDING_MESSAGE_ID); ExtensionAttribute pendingMessageAttribute = new ExtensionAttribute(); @@ -341,7 +341,7 @@ public final class BpmnJsonConverterUtil { } // 短信模板配置 - if (Objects.nonNull(noticeConf.getSms())) { + if (Objects.nonNull(noticeConf.getSms()) || Objects.nonNull(noticeConf.getSms().getSmsId())) { ExtensionElement smsMessage = new ExtensionElement(); smsMessage.setName(TEMPLATE_SMS_MESSAGE_ID); ExtensionAttribute smsMessageAttribute = new ExtensionAttribute();