diff --git a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java
index 66883cd79..2a208d8ee 100644
--- a/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java
+++ b/liteflow-core/src/main/java/com/yomahub/liteflow/flow/element/condition/SwitchCondition.java
@@ -57,14 +57,14 @@ public class SwitchCondition extends Condition {
 				String _targetId = target[0];
 				String _targetTag = target[1];
 				targetExecutor = targetList.stream().filter(executable -> {
-					return (StrUtil.startWith(_targetId, TAG_PREFIX) && _targetTag.equals(executable.getTag()))
+					return (StrUtil.startWith(_targetId, TAG_PREFIX) && ObjectUtil.equal(_targetTag,executable.getTag()))
 							|| ((StrUtil.isEmpty(_targetId) || _targetId.equals(executable.getId()))
 							&& (StrUtil.isEmpty(_targetTag) || _targetTag.equals(executable.getTag())));
 				}).findFirst().orElse(null);
 			}
 			else {
 				targetExecutor = targetList.stream()
-					.filter(executable -> executable.getId().equals(targetId))
+					.filter(executable -> ObjectUtil.equal(executable.getId(),targetId) )
 					.findFirst()
 					.orElse(null);
 			}