From 2c99667aae53e8ee48e206a61375af00c3d7ceb2 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Fri, 28 Feb 2025 15:58:59 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E9=80=9A=E7=9F=A5=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=EF=BC=8C=E5=85=B3=E9=97=AD=E8=87=AA?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=80=9A=E7=9F=A5=EF=BC=8C=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1329089820983296]流程管理-通知模版不存在,关闭自定义通知,流程无法保存 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1329089820983296 --- .../module/process/service/ProcessServiceImpl.java | 10 ++++++---- .../makeup/NotifyPolicyConfigMakeupHandler.java | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java index 8f156456e..4f0349792 100644 --- a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java +++ b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java @@ -309,11 +309,13 @@ public class ProcessServiceImpl implements ProcessService, IProcessCrossoverServ if (MapUtils.isNotEmpty(processConfig)) { InvokeNotifyPolicyConfigVo notifyPolicyConfig = processConfig.getObject("notifyPolicyConfig", InvokeNotifyPolicyConfigVo.class); if (notifyPolicyConfig != null) { - INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class); - if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(notifyPolicyConfig)) { - if (Objects.equals(action, "save")) { + if (Objects.equals(action, "save")) { + INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class); + if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(notifyPolicyConfig)) { DependencyManager.insert(NotifyPolicyProcessDependencyHandler.class, notifyPolicyConfig.getPolicyId(), processVo.getUuid()); - } else if (Objects.equals(action, "delete")) { + } + } else if (Objects.equals(action, "delete")) { + if (Objects.equals(notifyPolicyConfig.getIsCustom(), 1)) { DependencyManager.delete(NotifyPolicyProcessDependencyHandler.class, processVo.getUuid()); } } diff --git a/src/main/java/neatlogic/module/process/stephandler/makeup/NotifyPolicyConfigMakeupHandler.java b/src/main/java/neatlogic/module/process/stephandler/makeup/NotifyPolicyConfigMakeupHandler.java index 0e5d8130f..79aecdaa7 100644 --- a/src/main/java/neatlogic/module/process/stephandler/makeup/NotifyPolicyConfigMakeupHandler.java +++ b/src/main/java/neatlogic/module/process/stephandler/makeup/NotifyPolicyConfigMakeupHandler.java @@ -42,11 +42,13 @@ public class NotifyPolicyConfigMakeupHandler implements IProcessStepMakeupHandle /* 组装通知策略id **/ InvokeNotifyPolicyConfigVo notifyPolicyConfig = stepConfigObj.getObject("notifyPolicyConfig", InvokeNotifyPolicyConfigVo.class); if (notifyPolicyConfig != null) { - INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class); - if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(notifyPolicyConfig)) { - if (Objects.equals(action, "save")) { + if (Objects.equals(action, "save")) { + INotifyServiceCrossoverService notifyServiceCrossoverService = CrossoverServiceFactory.getApi(INotifyServiceCrossoverService.class); + if (notifyServiceCrossoverService.checkNotifyPolicyIsExists(notifyPolicyConfig)) { DependencyManager.insert(NotifyPolicyProcessStepDependencyHandler.class, notifyPolicyConfig.getPolicyId(), processStepVo.getUuid()); - } else if (Objects.equals(action, "delete")) { + } + } else if (Objects.equals(action, "delete")) { + if (Objects.equals(notifyPolicyConfig.getIsCustom(), 1)) { DependencyManager.delete(NotifyPolicyProcessStepDependencyHandler.class, processStepVo.getUuid()); } } -- Gitee