diff --git a/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java b/src/main/java/neatlogic/module/process/service/ProcessServiceImpl.java index 8f156456e6587f7a37f75cc2a4f0f1f6726c01a0..4f0349792d1f8ec304744cfffa03fed7968bc6e0 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 0e5d8130f580b6a9cc1a3a570e8239faf7fc5a3f..79aecdaa7bbd043a57fac50e68ddb8f7dd4f9f20 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()); } }