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 886b13b874d899262ea3789fc395dd077ebffdd3..1f938d9dbeeada712a52548c415cba01dcf43f26 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 25b9574ced6d022142942deff31b7382da49897a..c7090ac17d2103a381beae143b1055fce4ad780d 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; }