From 809fdaeacffd12edb9ca7165c21ee622ed0d4cd8 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Sat, 16 Dec 2023 17:37:40 +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-=E5=AF=BC=E5=87=BA=E7=9A=84=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E4=B8=AD=EF=BC=8C=E6=8A=8A=E9=80=9A=E7=9F=A5=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E5=85=A8=E5=B1=80=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=80=E8=B5=B7=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1046401398571008]流程管理-导出的流程中，把通知策略全局默认配置一起导出 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1046401398571008
---
 .../handler/ProcessImportExportHandler.java            | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java b/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java
index 82d15fa31..d694ba30f 100644
--- a/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java
+++ b/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java
@@ -147,6 +147,10 @@ public class ProcessImportExportHandler extends ImportExportHandlerBase {
                     if (policyId == null) {
                         continue;
                     }
+                    Integer isCustom = notifyPolicyConfig.getInteger("isCustom");
+                    if (!Objects.equals(isCustom, 1)) {
+                        continue;
+                    }
                     if (action == IMPORT) {
                         Object newPrimaryKey = getNewPrimaryKey(FrameworkImportExportHandlerType.NOTIFY_POLICY, policyId, primaryChangeList);
                         if (newPrimaryKey != null) {
@@ -179,8 +183,9 @@ public class ProcessImportExportHandler extends ImportExportHandlerBase {
             // 集成
             JSONObject notifyPolicyConfig = processConfig.getJSONObject("notifyPolicyConfig");
             if (MapUtils.isNotEmpty(notifyPolicyConfig)) {
+                Integer isCustom = notifyPolicyConfig.getInteger("isCustom");
                 Long policyId = notifyPolicyConfig.getLong("policyId");
-                if (policyId != null) {
+                if (Objects.equals(isCustom, 1) && policyId != null) {
                     if (action == IMPORT) {
                         Object newPrimaryKey = getNewPrimaryKey(FrameworkImportExportHandlerType.NOTIFY_POLICY, policyId, primaryChangeList);
                         if (newPrimaryKey != null) {
@@ -248,8 +253,9 @@ public class ProcessImportExportHandler extends ImportExportHandlerBase {
                 }
                 JSONObject notifyPolicyConfig = stepConfig.getJSONObject("notifyPolicyConfig");
                 if (MapUtils.isNotEmpty(notifyPolicyConfig)) {
+                    Integer isCustom = notifyPolicyConfig.getInteger("isCustom");
                     Long policyId = notifyPolicyConfig.getLong("policyId");
-                    if (policyId != null) {
+                    if (Objects.equals(isCustom, 1) && policyId != null) {
                         if (action == IMPORT) {
                             Object newPrimaryKey = getNewPrimaryKey(FrameworkImportExportHandlerType.NOTIFY_POLICY, policyId, primaryChangeList);
                             if (newPrimaryKey != null) {
-- 
Gitee