diff --git a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java index 482ef80e40951ce72f1d74c07b11efb8978c1f90..1c79f54812f5115ee8469c5b180d0dfa861d92fc 100644 --- a/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java +++ b/src/main/java/neatlogic/module/autoexec/service/AutoexecCombopServiceImpl.java @@ -652,15 +652,18 @@ public class AutoexecCombopServiceImpl implements AutoexecCombopService, IAutoex if (Objects.equals(preNodeOutputParamVo.getType(), inputParamVo.getType())) { continue; } - // 文本域类型 上游节点输出参数值 文本类型 - if (Objects.equals(inputParamVo.getType(), ParamType.TEXTAREA.getValue()) && Objects.equals(preNodeOutputParamVo.getType(), ParamType.TEXT.getValue())) { + // 文本域类型和文本类型 上游节点输出参数值 (可以是任意类型) + if (Objects.equals(inputParamVo.getType(), ParamType.TEXTAREA.getValue()) || Objects.equals(inputParamVo.getType(), ParamType.TEXT.getValue())) { continue; - - } - if (Objects.equals(inputParamVo.getType(), ParamType.TEXT.getValue()) && Objects.equals(preNodeOutputParamVo.getType(), ParamType.TEXTAREA.getValue())) { - continue; - } +// if (Objects.equals(inputParamVo.getType(), ParamType.TEXTAREA.getValue()) && Objects.equals(preNodeOutputParamVo.getType(), ParamType.TEXT.getValue())) { +// continue; +// +// } +// if (Objects.equals(inputParamVo.getType(), ParamType.TEXT.getValue()) && Objects.equals(preNodeOutputParamVo.getType(), ParamType.TEXTAREA.getValue())) { +// continue; +// +// } throw new AutoexecParamMappingTargetTypeMismatchException(phaseName, operationName, inputParamLabel, conversionPreNodeParamPath(preNodeNameMap, preOperationNameMap, value)); } else if (Objects.equals(mappingMode, ParamMappingMode.PRE_NODE_OUTPUT_PARAM_KEY.getValue())) { String value = null;