From 0869313dcb221553be18148461453064324b9ece Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 26 Jul 2024 16:29:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E7=AC=AC=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E4=B8=8A=E6=8A=A5=E5=B7=A5=E5=8D=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=8C=E5=85=81=E8=AE=B8=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84=E8=A1=A8=E5=8D=95=E5=B1=9E?= =?UTF-8?q?=E6=80=A7=E5=80=BC=EF=BC=8C=E5=B0=BD=E9=87=8F=E4=B8=8D=E6=8A=9B?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1209422662041600]第三方上报工单接口优化，允许传入不存在的表单属性值，尽量不抛异常 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1209422662041600 --- .../api/processtask/ProcessTaskDraftSaveApi.java | 5 +++-- .../service/ProcessTaskCreatePublicServiceImpl.java | 12 ++++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) 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 2ab39d537..5df71fc59 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 097a54d82..45b33a88f 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) { -- Gitee