From b77ec3ab33465e05b798183977b5ed65f30c32fd Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 29 Apr 2025 19:24:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=AF=81=E4=B9=A6?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=E6=B5=81=E7=A8=8B=E5=B7=A5=E5=8D=95=E6=B5=81?= =?UTF-8?q?=E8=BD=AC=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1410214153125888]证书变更流程工单流转报错 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1410214153125888 --- .../service/ProcessStepHandlerUtil.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java index 90767e9b3..72e044611 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java +++ b/src/main/java/neatlogic/module/process/service/ProcessStepHandlerUtil.java @@ -32,6 +32,7 @@ import neatlogic.framework.form.dao.mapper.FormMapper; import neatlogic.framework.form.dto.AttributeDataVo; import neatlogic.framework.form.dto.FormAttributeVo; import neatlogic.framework.form.dto.FormVersionVo; +import neatlogic.framework.form.exception.FormAttributeDataException; import neatlogic.framework.form.exception.FormAttributeRequiredException; import neatlogic.framework.notify.core.INotifyTriggerType; import neatlogic.framework.process.audithandler.core.IProcessTaskAuditType; @@ -1118,10 +1119,24 @@ public class ProcessStepHandlerUtil implements IProcessStepHandlerUtil, IProcess processTaskMapper.insertProcessTaskFormAttributeList(needSaveProcessTaskFormAttributeDataList); } // 保存表单扩展组件值 - List oldExtendAttributeDataList = processTaskMapper.getProcessTaskExtendFormAttributeDataListByProcessTaskId(processTaskId, null); - Map oldExtendAttributeDataMap = oldExtendAttributeDataList.stream().collect(Collectors.toMap(AttributeDataVo::getAttributeUuid, e -> e)); JSONArray formExtendAttributeDataList = paramObj.getJSONArray("formExtendAttributeDataList"); if (CollectionUtils.isNotEmpty(formExtendAttributeDataList)) { + Map> tag2KeyListMap = new HashMap<>(); + for (int j = 0; j < formExtendAttributeDataList.size(); j++) { + JSONObject formExtendAttributeDataObj = formExtendAttributeDataList.getJSONObject(j); + if (MapUtils.isEmpty(formExtendAttributeDataObj)) { + continue; + } + String tag = formExtendAttributeDataObj.getString("tag"); + String key = formExtendAttributeDataObj.getString("key"); + List keyList = tag2KeyListMap.computeIfAbsent(tag, k -> new ArrayList<>()); + if (keyList.contains(key)) { + throw new FormAttributeDataException("formExtendAttributeDataList", tag, key); + } + keyList.add(key); + } + List oldExtendAttributeDataList = processTaskMapper.getProcessTaskExtendFormAttributeDataListByProcessTaskId(processTaskId, null); + Map oldExtendAttributeDataMap = oldExtendAttributeDataList.stream().collect(Collectors.toMap(AttributeDataVo::getAttributeUuid, e -> e)); List needSaveProcessTaskFormExtendAttributeDataList = new ArrayList<>(); for (int j = 0; j < formExtendAttributeDataList.size(); j++) { JSONObject formExtendAttributeDataObj = formExtendAttributeDataList.getJSONObject(j); -- Gitee