From 2d8953ed96b2c93564b13523e545601c4894e680 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Sat, 16 Dec 2023 17:32:47 +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
---
 .../core/ImportExportHandlerBase.java          |  6 +++---
 .../handler/FileImportExportHandler.java       | 18 ++++++++++--------
 .../handler/MatrixImportExportHandler.java     |  2 +-
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java b/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java
index 343212d1d..7e8730494 100644
--- a/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java
+++ b/src/main/java/neatlogic/framework/importexport/core/ImportExportHandlerBase.java
@@ -133,11 +133,11 @@ public abstract class ImportExportHandlerBase implements ImportExportHandler {
         dependencyList.add(dependencyVo);
         ImportExportVo importExportVo = importExportHandler.exportData(primaryKey, dependencyList, zipOutputStream);
         if (importExportVo != null) {
-            if (logger.isWarnEnabled()) {
-                logger.warn("export data: " + importExportVo.getType() + "-" + importExportVo.getName() + "-" + importExportVo.getPrimaryKey());
-            }
             dependencyVo.setName(importExportVo.getName());
             if (zipOutputStream != null) {
+                if (logger.isWarnEnabled()) {
+                    logger.warn("export data: " + importExportVo.getType() + "-" + importExportVo.getName() + "-" + importExportVo.getPrimaryKey());
+                }
                 try {
                     zipOutputStream.putNextEntry(new ZipEntry("dependency-folder/" + importExportVo.getPrimaryKey() + ".json"));
                     zipOutputStream.write(JSONObject.toJSONBytes(importExportVo));
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/FileImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/FileImportExportHandler.java
index 42644506d..a6c22f79f 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/FileImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/FileImportExportHandler.java
@@ -96,14 +96,16 @@ public class FileImportExportHandler extends ImportExportHandlerBase {
                 while ((len = in.read(buf)) != -1) {
                     out.write(buf, 0, len);
                 }
-                zipOutputStream.putNextEntry(new ZipEntry("attachment-folder/" + fileVo.getId() + "/" + fileVo.getName()));
-                zipOutputStream.write(out.toByteArray());
-                zipOutputStream.closeEntry();
-                in.close();
-                out.reset();
-            }
-            if (logger.isWarnEnabled()) {
-                logger.warn("export file: " + fileVo.getName());
+                if (zipOutputStream != null) {
+                    zipOutputStream.putNextEntry(new ZipEntry("attachment-folder/" + fileVo.getId() + "/" + fileVo.getName()));
+                    zipOutputStream.write(out.toByteArray());
+                    zipOutputStream.closeEntry();
+                    in.close();
+                    out.reset();
+                    if (logger.isWarnEnabled()) {
+                        logger.warn("export file: " + fileVo.getName());
+                    }
+                }
             }
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
diff --git a/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java b/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
index 274968ba7..e5bd4f83b 100644
--- a/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
+++ b/src/main/java/neatlogic/module/framework/importexport/handler/MatrixImportExportHandler.java
@@ -103,7 +103,7 @@ public class MatrixImportExportHandler extends ImportExportHandlerBase {
         if (Objects.equals(matrix.getType(), "external")) {
             doExportData(FrameworkImportExportHandlerType.INTEGRATION, matrixVo.getIntegrationUuid(), dependencyList, zipOutputStream);
         } else if (Objects.equals(matrix.getType(), "cmdbci")) {
-            doExportData(FrameworkImportExportHandlerType.CMDB_CI, matrixVo.getId(), dependencyList, zipOutputStream);
+            doExportData(FrameworkImportExportHandlerType.CMDB_CI, matrixVo.getCiId(), dependencyList, zipOutputStream);
         }
         ImportExportVo importExportVo = new ImportExportVo(this.getType().getValue(), primaryKey, matrixVo.getLabel());
         importExportVo.setDataWithObject(matrixVo);
-- 
Gitee