From f1d2a9b1c26ec4ccc875d33f87d3e3562f6683d4 Mon Sep 17 00:00:00 2001
From: opensnail <598092184@qq.com>
Date: Mon, 6 Jan 2025 23:14:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:(1.3.0-beta1.1):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=96=87=E5=80=BC=E4=B8=BAnull=20=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server/job/task/support/handler/WorkflowBatchHandler.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java
index 0f23412ea..bcabf6fd5 100644
--- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java
+++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java
@@ -469,6 +469,10 @@ public class WorkflowBatchHandler {
 
     public static void mergeMaps(Map<String, Object> mainMap, Map<String, Object> waitMergeMap) {
         for (Map.Entry<String, Object> entry : waitMergeMap.entrySet()) {
+            if (Objects.isNull(entry.getKey()) || Objects.isNull(entry.getValue())) {
+                SnailJobLog.LOCAL.warn("上下文的key和value不支持NULl");
+                continue;
+            }
             mainMap.merge(entry.getKey(), entry.getValue(), (v1, v2) -> v2);
         }
     }