From 398c44b851630cbfd4fa997959d65fe62350307a Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Thu, 11 Sep 2025 15:18:56 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96=E8=8A=82=E7=82=B9=E5=BC=95=E7=94=A8=E7=BB=84=E5=90=88?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=97=B6=EF=BC=8C=E5=AF=BC=E5=87=BA=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=E5=9B=BE=E6=B2=A1=E6=9C=89=E7=BB=84=E5=90=88=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1507994276167680]自动化节点引用组合工具时，导出流程图没有组合工具数据 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1507994276167680
---
 .../handler/ProcessImportExportHandler.java   | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 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 ab1dc4315..0038ee64e 100644
--- a/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java
+++ b/src/main/java/neatlogic/module/process/importexport/handler/ProcessImportExportHandler.java
@@ -388,8 +388,8 @@ public class ProcessImportExportHandler extends ImportExportHandlerBase {
                             }
                         }
                     }
-                } else if (Objects.equals(handler, "autoexec")) {
-                    JSONObject autoexecConfig = stepConfig.getJSONObject("autoexecConfig");
+                } else if (Objects.equals(handler, "createjob")) {
+                    JSONObject autoexecConfig = stepConfig.getJSONObject("createJobConfig");
                     if (MapUtils.isNotEmpty(autoexecConfig)) {
                         JSONArray configList = autoexecConfig.getJSONArray("configList");
                         if (CollectionUtils.isNotEmpty(configList)) {
@@ -398,17 +398,20 @@ public class ProcessImportExportHandler extends ImportExportHandlerBase {
                                 if (MapUtils.isEmpty(configObj)) {
                                     continue;
                                 }
-                                Long autoexecCombopId = configObj.getLong("autoexecCombopId");
-                                if (autoexecCombopId == null) {
-                                    continue;
-                                }
-                                if (action == IMPORT) {
-                                    Object newPrimaryKey = getNewPrimaryKey(FrameworkImportExportHandlerType.AUTOEXEC_COMBOP, autoexecCombopId, primaryChangeList);
-                                    if (newPrimaryKey != null) {
-                                        configObj.put("autoexecCombopId", newPrimaryKey);
+                                String type = configObj.getString("type");
+                                if (Objects.equals(type, "combop")) {
+                                    Long autoexecCombopId = configObj.getLong("combopId");
+                                    if (autoexecCombopId == null) {
+                                        continue;
+                                    }
+                                    if (action == IMPORT) {
+                                        Object newPrimaryKey = getNewPrimaryKey(FrameworkImportExportHandlerType.AUTOEXEC_COMBOP, autoexecCombopId, primaryChangeList);
+                                        if (newPrimaryKey != null) {
+                                            configObj.put("combopId", newPrimaryKey);
+                                        }
+                                    } else if (action == EXPORT) {
+                                        doExportData(FrameworkImportExportHandlerType.AUTOEXEC_COMBOP, autoexecCombopId, dependencyList, zipOutputStream);
                                     }
-                                } else if (action == EXPORT) {
-                                    doExportData(FrameworkImportExportHandlerType.AUTOEXEC_COMBOP, autoexecCombopId, dependencyList, zipOutputStream);
                                 }
                             }
                         }
-- 
Gitee