From 4ad4860d6ccb157c806b725adfc8ea8c15bf3001 Mon Sep 17 00:00:00 2001
From: wangli <274027703@qq.com>
Date: Thu, 14 Dec 2023 14:12:34 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E4=BF=AE=E5=A4=8D=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E6=A8=A1=E6=9D=BF=E6=94=B9=E4=B8=BA=E4=BA=86=E9=9D=9E?=
 =?UTF-8?q?=E6=AF=94=E5=A1=AB=E9=A1=B9,=E9=83=A8=E5=88=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E6=9C=AA=E9=98=B2=E5=BE=A1=20NPE=20=E7=9A=84=E6=83=85?=
 =?UTF-8?q?=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RocketMqMessagePushEventListener.java     | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
index a76b7b2f6..d29850b28 100644
--- a/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
+++ b/workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/listener/notice/RocketMqMessagePushEventListener.java
@@ -132,7 +132,8 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis
             return;
         }
         if (log.isDebugEnabled()) {
-            log.debug("RocketMqMessagePushEventListener#onPendingPush...msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getNotice().getNoticeMessageId(), JSON.toJSONString(event.getAssigner()));
+            log.debug("RocketMqMessagePushEventListener#onPendingPush...msgTemplateId: {}, receivePerson: {}",
+                    event.getNoticeConfig().getPending().getPendingMessageId(), JSON.toJSONString(event.getAssigner()));
         }
         if (Objects.nonNull(event.getNoticeConfig().getPending())) {
             MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING,
@@ -142,7 +143,8 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis
 
         }
         if (log.isDebugEnabled()) {
-            log.debug("RocketMqMessagePushEventListener#onPendingPush...end, msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getNotice().getNoticeMessageId(), JSON.toJSONString(event.getAssigner()));
+            log.debug("RocketMqMessagePushEventListener#onPendingPush...end, msgTemplateId: {}, receivePerson: {}",
+                    event.getNoticeConfig().getPending().getPendingMessageId(), JSON.toJSONString(event.getAssigner()));
         }
     }
 
@@ -154,13 +156,16 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis
             return;
         }
         if (log.isDebugEnabled()) {
-            log.debug("RocketMqMessagePushEventListener#onPendingComplete...msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getNotice().getNoticeMessageId(), JSON.toJSONString(event.getAssigner()));
+            log.debug("RocketMqMessagePushEventListener#onPendingComplete...msgTemplateId: {}, receivePerson: {}",
+                    event.getNoticeConfig().getPending().getPendingMessageId(), JSON.toJSONString(event.getAssigner()));
         }
         MessagePushDTO dto = build(event.getNoticeConfig().getPending().getPendingMessageId(), PROCESS_PUSH_PENDING_COMPLETE,
                 event, null);
         sendMessageQueue(dto, PROCESS_PUSH_PENDING_COMPLETE);
         if (log.isDebugEnabled()) {
-            log.debug("RocketMqMessagePushEventListener#onPendingComplete...end, msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getNotice().getNoticeMessageId(), JSON.toJSONString(event.getAssigner()));
+            log.debug("RocketMqMessagePushEventListener#onPendingComplete...end, msgTemplateId: {}, receivePerson: " +
+                    "{}", event.getNoticeConfig().getPending().getPendingMessageId(),
+                    JSON.toJSONString(event.getAssigner()));
         }
     }
 
@@ -173,13 +178,15 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis
             return;
         }
         if (log.isDebugEnabled()) {
-            log.debug("RocketMqMessagePushEventListener#onSms...msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getNotice().getNoticeMessageId(), JSON.toJSONString(event.getAssigner()));
+            log.debug("RocketMqMessagePushEventListener#onSms...msgTemplateId: {}, receivePerson: {}",
+                    event.getNoticeConfig().getSms().getSmsId(), JSON.toJSONString(event.getAssigner()));
         }
         MessagePushDTO dto = build(event.getNoticeConfig().getSms().getSmsId(), PROCESS_PUSH_SMS, event,
                 collectionVariable(event));
         sendMessageQueue(dto, PROCESS_PUSH_SMS);
         if (log.isDebugEnabled()) {
-            log.debug("RocketMqMessagePushEventListener#onSms...end, msgTemplateId: {}, receivePerson: {}", event.getNoticeConfig().getNotice().getNoticeMessageId(), JSON.toJSONString(event.getAssigner()));
+            log.debug("RocketMqMessagePushEventListener#onSms...end, msgTemplateId: {}, receivePerson: {}",
+                    event.getNoticeConfig().getSms().getSmsId(), JSON.toJSONString(event.getAssigner()));
         }
     }