From 3840db74bab79b53aecd684ebaf1698d93ae594e Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Mon, 22 Jul 2024 10:52:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?= =?UTF-8?q?=E9=80=9A=E8=BF=87=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=8D=95=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=97=B6=E4=B8=8D=E6=A0=A1=E9=AA=8C=E5=BF=85?= =?UTF-8?q?=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1206341182390272]后端-通过修改工单表单数据接口修改表单时不校验必填 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1206341182390272 --- .../api/processtask/UpdateProcessTaskFormApi.java | 1 + .../module/process/service/ProcessStepHandlerUtil.java | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java b/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java index 886b13b87..1f938d9db 100644 --- a/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java +++ b/src/main/java/neatlogic/module/process/api/processtask/UpdateProcessTaskFormApi.java @@ -89,6 +89,7 @@ public class UpdateProcessTaskFormApi extends PrivateApiComponentBase { param.put("formExtendAttributeDataList", paramObj.getJSONArray("formExtendAttributeDataList")); param.put("hidecomponentList", paramObj.getJSONArray("hidecomponentList")); param.put("readcomponentList", paramObj.getJSONArray("readcomponentList")); + param.put("needVerifyIsRequired", false); param.put("source", paramObj.getString("source")); processStepHandlerUtil.saveForm(processTaskStepVo); processStepHandlerUtil.audit(processTaskStepVo, ProcessTaskAuditType.UPDATEFORM); diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index 25b9574ce..c7090ac17 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -932,6 +932,10 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess readcomponentList = readcomponentArray.toJavaList(String.class); } + Boolean needVerifyIsRequired = paramObj.getBoolean("needVerifyIsRequired"); + if (needVerifyIsRequired == null) { + needVerifyIsRequired = true; + } Map formExtendAttributeMap = new HashMap<>(); Map formCustomExtendAttributeMap = new HashMap<>(); List mainSceneFormAttributeList; @@ -995,12 +999,12 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess List formAttributeVoList = formVersionVo.getFormAttributeList(); - Map attributeLabelMap = new HashMap<>(); +// Map attributeLabelMap = new HashMap<>(); if (CollectionUtils.isNotEmpty(formAttributeVoList)) { for (FormAttributeVo formAttributeVo : formAttributeVoList) { - attributeLabelMap.put(formAttributeVo.getUuid(), formAttributeVo.getLabel()); - if (formAttributeVo.isRequired()) { +// attributeLabelMap.put(formAttributeVo.getUuid(), formAttributeVo.getLabel()); + if (formAttributeVo.isRequired() && needVerifyIsRequired) { if (hidecomponentList.contains(formAttributeVo.getUuid())) { continue; } -- Gitee