From fccd67d1313f769616bf0355f6d31ebb5fab47d8 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Sat, 16 Dec 2023 17:36:10 +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/CiImportExportHandler.java        | 27 +++++++++++--------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/java/neatlogic/module/cmdb/importexport/handler/CiImportExportHandler.java b/src/main/java/neatlogic/module/cmdb/importexport/handler/CiImportExportHandler.java
index 8dfcd2f8..a761c499 100644
--- a/src/main/java/neatlogic/module/cmdb/importexport/handler/CiImportExportHandler.java
+++ b/src/main/java/neatlogic/module/cmdb/importexport/handler/CiImportExportHandler.java
@@ -140,8 +140,10 @@ public class CiImportExportHandler extends ImportExportHandlerBase {
                     }
                 }
             }
-            for (AttrVo attr : attrList) {
-                attrService.insertAttr(attr);
+            if (Objects.equals(ciVo.getIsVirtual(), 0)) {
+                for (AttrVo attr : attrList) {
+                    attrService.insertAttr(attr);
+                }
             }
         } else {
             ciService.updateCi(ciVo);
@@ -161,13 +163,15 @@ public class CiImportExportHandler extends ImportExportHandlerBase {
                     }
                 }
             }
-            List<AttrVo> oldAttrList = attrMapper.getAttrBaseInfoByCiId(oldCi.getId());
-            List<Long> oldAttrIdList = oldAttrList.stream().map(AttrVo::getId).collect(Collectors.toList());
-            for (AttrVo attr : attrList) {
-                if (oldAttrIdList.contains(attr.getId())) {
-                    attrService.updateAttr(attr);
-                } else {
-                    attrService.insertAttr(attr);
+            if (Objects.equals(ciVo.getIsVirtual(), 0)) {
+                List<AttrVo> oldAttrList = attrMapper.getAttrBaseInfoByCiId(oldCi.getId());
+                List<Long> oldAttrIdList = oldAttrList.stream().map(AttrVo::getId).collect(Collectors.toList());
+                for (AttrVo attr : attrList) {
+                    if (oldAttrIdList.contains(attr.getId())) {
+                        attrService.updateAttr(attr);
+                    } else {
+                        attrService.insertAttr(attr);
+                    }
                 }
             }
             relMapper.deleteRelGroupByCiId(ciVo.getId());
@@ -207,7 +211,8 @@ public class CiImportExportHandler extends ImportExportHandlerBase {
             throw new CiNotFoundException(id);
         }
         if (Objects.equals(ciVo.getIsVirtual(), 1) && ciVo.getFileId() != null) {
-            ciVo.setFileVo(fileMapper.getFileById(ciVo.getFileId()));
+            String viewXml = ciMapper.getCiViewXmlById(ciVo.getId());
+            ciVo.setViewXml(viewXml);
         }
         List<AttrVo> attrList = attrMapper.getAttrBaseInfoByCiId(id);
         List<RelVo> relList = relMapper.getRelBaseInfoByCiId(id);
@@ -271,7 +276,7 @@ public class CiImportExportHandler extends ImportExportHandlerBase {
                 doExportData(CmdbImportExportHandlerType.CI_TYPE, ciVo.getTypeId(), dependencyList, zipOutputStream);
             }
         }
-        if (Objects.equals(ciVo.getIsVirtual(), 1) && ciVo.getFileId() != null) {
+        if (Objects.equals(ciVo.getIsVirtual(), 1) && ciVo.getFileId() != null && fileMapper.getFileById(ciVo.getFileId()) != null) {
             if (action == IMPORT) {
                 Object newPrimaryKey = getNewPrimaryKey(FrameworkImportExportHandlerType.FILE, ciVo.getFileId(), primaryChangeList);
                 if (newPrimaryKey != null) {
-- 
Gitee