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 6dc5635b5..4af33b6cd 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 @@ -26,6 +26,7 @@ import javax.annotation.Resource; import java.text.SimpleDateFormat; import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Objects; @@ -213,13 +214,15 @@ public class RocketMqMessagePushEventListener implements BpmnMessagePushEventLis if (CollectionUtils.isEmpty(originVariables)) { return variables; } - originVariables.forEach((k, v) -> { + Iterator> iterator = originVariables.entrySet().iterator(); + while (iterator.hasNext()) { + Map.Entry entry = iterator.next(); REMOVE_KEYS.forEach(key -> { - if (k.contains(key)) { - originVariables.remove(k); + if (entry.getKey().contains(key)) { + iterator.remove(); } }); - }); + } variables.putAll(originVariables); return variables;