diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java index 2ab39d537cc3e5eab0291147f830dcfa794d14a1..5df71fc5925484f28d0117cf10b41deba2d5bdef 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskDraftSaveApi.java @@ -80,11 +80,12 @@ public class ProcessTaskDraftSaveApi extends PrivateApiComponentBase { @Param(name = "channelTypeRelationId", type = ApiParamType.LONG, desc = "term.itsm.channeltyperelationid", help = "从转报进入上报页时,传channelTypeRelationId"), @Param(name = "source", type = ApiParamType.STRING, defaultValue = "pc", desc = "common.source"), @Param(name = "parentProcessTaskStepId", type = ApiParamType.LONG, desc = "nmpap.processtaskdraftgetapi.input.param.desc.parentprocesstaskstepid", help = "创建子流程时,传parentProcessTaskStepId"), - @Param(name = "invoke", type = ApiParamType.STRING, desc = "nmpap.processtaskdraftsaveapi.input.param.desc.invoke", help = "subprocess :子流程") + @Param(name = "invoke", type = ApiParamType.STRING, desc = "nmpap.processtaskdraftsaveapi.input.param.desc.invoke", help = "subprocess :子流程"), + @Param(name = "regionId", type = ApiParamType.LONG, desc = "nmtar.searchregionteamapi.input.param.desc.regionid") }) @Output({ @Param(name = "processTaskId", type = ApiParamType.LONG, desc = "term.itsm.processtaskid"), - @Param(name = "processTaskStepId", type = ApiParamType.LONG, desc = "步骤id") + @Param(name = "processTaskStepId", type = ApiParamType.LONG, desc = "term.itsm.processtaskstepid") }) @Description(desc = "nmpap.processtaskdraftsaveapi.getname") @Override diff --git a/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java index 097a54d824dded37ae8fe7b6d32ae71feaee56a5..45b33a88fac6a7aa79f73490267cb72ec8f5d0fb 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessTaskCreatePublicServiceImpl.java @@ -22,7 +22,6 @@ import neatlogic.framework.form.dao.mapper.FormMapper; import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.form.dto.FormVersionVo; import neatlogic.framework.form.exception.FormAttributeHandlerNotFoundException; -import neatlogic.framework.form.exception.FormAttributeNotFoundException; import neatlogic.framework.process.constvalue.ProcessFlowDirection; import neatlogic.framework.process.crossover.IProcessTaskCreatePublicCrossoverService; import neatlogic.framework.process.dto.ChannelVo; @@ -222,17 +221,23 @@ public class ProcessTaskCreatePublicServiceImpl implements ProcessTaskCreatePubl String attributeUuid = formAttributeData.getString("attributeUuid"); String label = formAttributeData.getString("label"); String key = formAttributeData.getString("key"); + Object dataObj = formAttributeData.get("dataList"); + if (dataObj == null) { + continue; + } if (StringUtils.isBlank(attributeUuid) && (StringUtils.isNotBlank(label) || StringUtils.isNotBlank(key))) { FormAttributeVo formAttributeVo = null; if (StringUtils.isNotBlank(key)) { formAttributeVo = keyAttributeMap.get(key); if (formAttributeVo == null) { - throw new FormAttributeNotFoundException(key); + continue; +// throw new FormAttributeNotFoundException(key); } } else if (StringUtils.isNotBlank(label)) { formAttributeVo = labelAttributeMap.get(label); if (formAttributeVo == null) { - throw new FormAttributeNotFoundException(label); + continue; +// throw new FormAttributeNotFoundException(label); } } FormHandlerBase formAttributeHandler = (FormHandlerBase) FormAttributeHandlerFactory.getHandler(formAttributeVo.getHandler()); @@ -242,7 +247,6 @@ public class ProcessTaskCreatePublicServiceImpl implements ProcessTaskCreatePubl JSONObject config = formAttributeVo.getConfig(); formAttributeData.put("attributeUuid", formAttributeVo.getUuid()); formAttributeData.put("handler", formAttributeVo.getHandler()); - Object dataObj = formAttributeData.get("dataList"); Object dataList = formAttributeHandler.getStandardValueBySimpleValue(dataObj, config); if (dataTypeNotArrayHandlerList.contains(formAttributeVo.getHandler())) { if (dataList instanceof List) {