From db315c147ad0267117228767d9309ce65d0a4e38 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 2 Jul 2024 12:17:01 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=8A=82=E7=82=B9=EF=BC=8C=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E8=BF=99=E4=B8=AA=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E8=BF=98=E6=98=AF=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1166498725330944]流程删除节点，保存的数据这个节点还是存在 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1166498725330944 --- .../neatlogic/module/process/api/process/ProcessGetApi.java | 2 ++ .../neatlogic/module/process/api/process/ProcessSaveApi.java | 2 ++ .../regulatehandler/MoveonConfigListRegulateHandler.java | 3 ++- .../stephandler/regulatehandler/SlaListRegulateHandler.java | 3 ++- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java index ae3b1152a..42d52bbdb 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessGetApi.java @@ -1,5 +1,6 @@ package neatlogic.module.process.api.process; +import neatlogic.framework.process.stephandler.core.ProcessMessageManager; import neatlogic.framework.process.util.ProcessConfigUtil; import neatlogic.framework.restful.constvalue.OperationTypeEnum; import neatlogic.framework.restful.annotation.*; @@ -55,6 +56,7 @@ public class ProcessGetApi extends PrivateApiComponentBase { if (processVo == null) { throw new ProcessNotFoundEditTargetException(uuid); } + ProcessMessageManager.setOperationType(OperationTypeEnum.SEARCH); processVo.setConfig(ProcessConfigUtil.regulateProcessConfig(processVo.getConfig())); int count = processMapper.getProcessReferenceCount(uuid); processVo.setReferenceCount(count); diff --git a/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java b/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java index 6faf59e0d..262eadc59 100644 --- a/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java +++ b/src/main/java/neatlogic/module/process/api/process/ProcessSaveApi.java @@ -6,6 +6,7 @@ import neatlogic.framework.dto.FieldValidResultVo; import neatlogic.framework.process.auth.PROCESS_MODIFY; import neatlogic.framework.process.dto.ProcessVo; import neatlogic.framework.process.exception.process.ProcessNameRepeatException; +import neatlogic.framework.process.stephandler.core.ProcessMessageManager; import neatlogic.framework.process.util.ProcessConfigUtil; import neatlogic.framework.restful.annotation.*; import neatlogic.framework.restful.constvalue.OperationTypeEnum; @@ -60,6 +61,7 @@ public class ProcessSaveApi extends PrivateApiComponentBase { @Description(desc = "流程保存接口") public Object myDoService(JSONObject jsonObj) throws Exception { ProcessVo processVo = JSON.toJavaObject(jsonObj, ProcessVo.class); + ProcessMessageManager.setOperationType(OperationTypeEnum.UPDATE); processVo.setConfig(ProcessConfigUtil.regulateProcessConfig(processVo.getConfig())); processVo.makeupConfigObj(); processService.saveProcess(processVo); diff --git a/src/main/java/neatlogic/module/process/stephandler/regulatehandler/MoveonConfigListRegulateHandler.java b/src/main/java/neatlogic/module/process/stephandler/regulatehandler/MoveonConfigListRegulateHandler.java index 62b46f872..ddde1b742 100644 --- a/src/main/java/neatlogic/module/process/stephandler/regulatehandler/MoveonConfigListRegulateHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/regulatehandler/MoveonConfigListRegulateHandler.java @@ -24,6 +24,7 @@ import neatlogic.framework.process.exception.process.ProcessConfigException; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.IRegulateHandler; import neatlogic.framework.process.stephandler.core.ProcessMessageManager; +import neatlogic.framework.restful.constvalue.OperationTypeEnum; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.springframework.stereotype.Service; @@ -53,7 +54,7 @@ public class MoveonConfigListRegulateHandler implements IRegulateHandler { List targetStepList = moveonConfigVo.getTargetStepList(); if (CollectionUtils.isNotEmpty(targetStepList)) { List list = ListUtils.removeAll(targetStepList, effectiveStepUuidList); - if (CollectionUtils.isNotEmpty(list)) { + if (CollectionUtils.isNotEmpty(list) && ProcessMessageManager.getOperationType() == OperationTypeEnum.UPDATE) { throw new ProcessConfigException(ProcessConfigException.Type.CONDITION, ProcessMessageManager.getStepName()); } } diff --git a/src/main/java/neatlogic/module/process/stephandler/regulatehandler/SlaListRegulateHandler.java b/src/main/java/neatlogic/module/process/stephandler/regulatehandler/SlaListRegulateHandler.java index dba4e6743..5d98f7e8c 100644 --- a/src/main/java/neatlogic/module/process/stephandler/regulatehandler/SlaListRegulateHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/regulatehandler/SlaListRegulateHandler.java @@ -26,6 +26,7 @@ import neatlogic.framework.process.exception.process.ProcessConfigException; import neatlogic.framework.process.stephandler.core.IProcessStepInternalHandler; import neatlogic.framework.process.stephandler.core.IRegulateHandler; import neatlogic.framework.process.stephandler.core.ProcessMessageManager; +import neatlogic.framework.restful.constvalue.OperationTypeEnum; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.collections4.MapUtils; @@ -61,7 +62,7 @@ public class SlaListRegulateHandler implements IRegulateHandler { processStepUuidList.removeIf(Objects::isNull); } List list = ListUtils.removeAll(processStepUuidList, effectiveStepUuidList); - if (CollectionUtils.isNotEmpty(list)) { + if (CollectionUtils.isNotEmpty(list) && ProcessMessageManager.getOperationType() == OperationTypeEnum.UPDATE) { throw new ProcessConfigException(ProcessConfigException.Type.SLA, slaName); } slaObj.put("processStepUuidList", processStepUuidList); -- Gitee