From 155e76af477655f5ce0f93403617a3b013aee55a Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Tue, 12 Dec 2023 20:10:39 +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

---
 .../core/common/utils/BpmnJsonConverterUtil.java  | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 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 83f6a1050..bf7d7fef8 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,38 +317,41 @@ public final class BpmnJsonConverterUtil {
         noticeConfigElement.setName(CONFIG_NOTICE);
 
         // 通知消息模板配置
-        if (Objects.nonNull(noticeConf.getNotice()) || Objects.nonNull(noticeConf.getNotice().getNoticeMessageId())) {
+        if (Objects.nonNull(noticeConf.getNotice()) && Objects.nonNull(noticeConf.getNotice().getNoticeMessageId())) {
             ExtensionElement noticeMessage = new ExtensionElement();
             noticeMessage.setName(TEMPLATE_NOTICE_MESSAGE_ID);
             ExtensionAttribute noticeMessageAttribute = new ExtensionAttribute();
             noticeMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE);
             noticeMessageAttribute.setValue(noticeConf.getNotice().getNoticeMessageId());
             noticeMessage.addAttribute(noticeMessageAttribute);
-            noticeMessage.setElementText(noticeConf.getNotice().getViewJson());
+            noticeMessage.setElementText(StringUtils.hasLength(noticeConf.getNotice().getViewJson()) ?
+                    noticeConf.getNotice().getViewJson() : "");
             noticeConfigElement.addChildElement(noticeMessage);
         }
 
         // 代办消息模板配置
-        if (Objects.nonNull(noticeConf.getPending()) || Objects.nonNull(noticeConf.getPending().getPendingMessageId())) {
+        if (Objects.nonNull(noticeConf.getPending()) && Objects.nonNull(noticeConf.getPending().getPendingMessageId())) {
             ExtensionElement pendingMessage = new ExtensionElement();
             pendingMessage.setName(TEMPLATE_PENDING_MESSAGE_ID);
             ExtensionAttribute pendingMessageAttribute = new ExtensionAttribute();
             pendingMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE);
             pendingMessageAttribute.setValue(noticeConf.getPending().getPendingMessageId());
             pendingMessage.addAttribute(pendingMessageAttribute);
-            pendingMessage.setElementText(noticeConf.getPending().getViewJson());
+            pendingMessage.setElementText(StringUtils.hasLength(noticeConf.getPending().getViewJson()) ?
+                    noticeConf.getPending().getViewJson() : "");
             noticeConfigElement.addChildElement(pendingMessage);
         }
 
         // 短信模板配置
-        if (Objects.nonNull(noticeConf.getSms()) || Objects.nonNull(noticeConf.getSms().getSmsId())) {
+        if (Objects.nonNull(noticeConf.getSms()) && Objects.nonNull(noticeConf.getSms().getSmsId())) {
             ExtensionElement smsMessage = new ExtensionElement();
             smsMessage.setName(TEMPLATE_SMS_MESSAGE_ID);
             ExtensionAttribute smsMessageAttribute = new ExtensionAttribute();
             smsMessageAttribute.setName(ELEMENT_ATTRIBUTE_VALUE);
             smsMessageAttribute.setValue(noticeConf.getSms().getSmsId());
             smsMessage.addAttribute(smsMessageAttribute);
-            smsMessage.setElementText(noticeConf.getSms().getViewJson());
+            smsMessage.setElementText(StringUtils.hasLength(noticeConf.getSms().getViewJson()) ?
+                    noticeConf.getSms().getViewJson() : "");
             noticeConfigElement.addChildElement(smsMessage);
         }
         mainProcess.addExtensionElement(noticeConfigElement);