From 2c036563034c7071af7282be770a34fa75b75680 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Tue, 23 Jan 2024 19:56:21 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20cmdb=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=BC=82=E5=B8=B8-=E6=A8=A1=E5=9E=8B?=
 =?UTF-8?q?=E2=80=9Cxxx=E2=80=9D=E5=AD=98=E5=9C=A8=E6=8B=A5=E6=9C=89?=
 =?UTF-8?q?=E7=9B=B8=E5=90=8C=E5=94=AF=E4=B8=80=E8=A7=84=E5=88=99=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E7=9A=84=E9=85=8D=E7=BD=AE=E9=A1=B9=E2=80=9Cyyy?=
 =?UTF-8?q?=E2=80=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1075292183953408]cmdb节点同步异常-模型“xxx”存在拥有相同唯一规则属性的配置项“yyy” http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1075292183953408
---
 .../cmdb/process/stephandler/CmdbSyncProcessComponent.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
index cf7d1408..f902137b 100644
--- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
+++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
@@ -1408,11 +1408,14 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase {
             }
             JSONArray newValueList = new JSONArray();
             String mappingMode = mappingObj.getMappingMode();
+            if (Objects.equals(mappingMode, "new")) {
+                continue;
+            }
             if (Objects.equals(mappingMode, "formTableComponent")
                     || Objects.equals(mappingMode, "formSubassemblyComponent")) {
                 String attributeUuid = valueList.getString(valueList.size() -1);
                 if (batchDataColumnList.contains(attributeUuid)) {
-                    newValueList.addAll(valueList);
+//                    newValueList.addAll(valueList);
                     continue;
                 }
                 Object dataObj = formAttributeDataMap.get(attributeUuid);
@@ -1434,8 +1437,6 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase {
                 } else {
                     newValueList.add(dataObj);
                 }
-            } else {
-                newValueList.addAll(valueList);
             }
             for (int i = newValueList.size() - 1; i >= 0; i--) {
                 if (StringUtils.isBlank(newValueList.getString(i))){
-- 
Gitee