From e4890e0e68fb019cef86d37385eaf7e6d54890ab Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Thu, 28 Dec 2023 23:44:54 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20ITSM-CMDB=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E8=8A=82=E7=82=B9-=E4=B8=8B=E6=8B=89=E6=A1=86?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=94=AF=E6=8C=81=E6=98=A0=E5=B0=84=E6=96=87?=
 =?UTF-8?q?=E6=9C=AC=E6=A1=86=EF=BC=8C=E9=80=9A=E8=BF=87=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E5=8C=B9=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1056576058654720]ITSM-CMDB同步节点-下拉框属性支持映射文本框，通过名称属性匹配 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1056576058654720
---
 .../cmdb/process/stephandler/CmdbSyncProcessComponent.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 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 24a181be..6ba19658 100644
--- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
+++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
@@ -222,8 +222,10 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase {
                     if (id != null) {
                         ciEntityTransactionVo.setCiEntityId(id);
                         ciEntityTransactionVo.setAction(TransactionActionType.UPDATE.getValue());
+                        ciEntityTransactionVo.setEditMode(EditModeType.PARTIAL.getValue());
                     } else {
                         ciEntityTransactionVo.setAction(TransactionActionType.INSERT.getValue());
+                        ciEntityTransactionVo.setEditMode(EditModeType.GLOBAL.getValue());
                     }
                     Integer isStart = configObject.getIsStart();
                     if (Objects.equals(isStart, 1)) {
@@ -1022,7 +1024,7 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase {
                                     if (!isFind) {
                                         search.setIdList(new ArrayList<>(downwardCiMap.keySet()));
                                         List<CiEntityVo> ciEntityList = ciEntityMapper.getCiEntityListByCiIdListAndName(search);
-                                        if (CollectionUtils.isNotEmpty(ciEntityList)) {
+                                        if (CollectionUtils.isEmpty(ciEntityList)) {
                                             throw new AttrValueIrregularException(attrVo, valueStr);
                                         }
                                         for (CiEntityVo ciEntity : ciEntityList) {
@@ -1033,7 +1035,7 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase {
                                     // 虚拟模型
                                     search.setCiId(ciVo.getId());
                                     List<CiEntityVo> ciEntityList = ciEntityMapper.getVirtualCiEntityBaseInfoByName(search);
-                                    if (CollectionUtils.isNotEmpty(ciEntityList)) {
+                                    if (CollectionUtils.isEmpty(ciEntityList)) {
                                         throw new AttrValueIrregularException(attrVo, valueStr);
                                     }
                                     for (CiEntityVo ciEntity : ciEntityList) {
-- 
Gitee