From ac2a006ad8ab377dcdfa092402cb8427c1851907 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 21 May 2025 19:14:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=87=8C=E8=BF=BD=E5=8A=A0=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=8F=90=E4=BA=A4=E6=97=B6=E4=BC=9A=E9=A2=9D=E5=A4=96?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E7=A9=BA=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1425239844552704]表单配置项修改组件里追加数据，表单提交时会额外新增一条空的数据 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1425239844552704
---
 .../cmdb/process/stephandler/CiEntitySyncProcessComponent.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java
index fbed692b..1e73046a 100644
--- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java
+++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java
@@ -250,6 +250,7 @@ public class CiEntitySyncProcessComponent extends ProcessStepHandlerBase {
                                         if (CollectionUtils.isNotEmpty(relDataList)) {
                                             for (int i = 0; i < relDataList.size(); i++) {
                                                 JSONObject relEntityObj = relDataList.getJSONObject(i);
+                                                relEntityObj.put("action", "replace");
                                                 if (relEntityObj.getLong("ciEntityId") == null && StringUtils.isNotBlank(relEntityObj.getString("ciEntityUuid"))) {
                                                     CiEntityTransactionVo tmpVo = ciEntityTransactionMap.get(relEntityObj.getString("ciEntityUuid"));
                                                     if (tmpVo != null) {
-- 
Gitee


From 1d2d0478e015cd1ff81c45473b80f550a8f5a080 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 21 May 2025 19:16:49 +0800
Subject: [PATCH 2/2] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=87=8C=E8=BF=BD=E5=8A=A0=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95=E6=8F=90=E4=BA=A4=E6=97=B6=E4=BC=9A=E9=A2=9D=E5=A4=96?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E6=9D=A1=E7=A9=BA=E7=9A=84=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1425239844552704]表单配置项修改组件里追加数据，表单提交时会额外新增一条空的数据 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1425239844552704
---
 .../cmdb/process/stephandler/CiEntitySyncProcessComponent.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java b/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java
index 1e73046a..f7134492 100644
--- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java
+++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CiEntitySyncProcessComponent.java
@@ -25,6 +25,7 @@ import neatlogic.framework.cmdb.dto.cientity.CiEntityVo;
 import neatlogic.framework.cmdb.dto.transaction.CiEntityTransactionVo;
 import neatlogic.framework.cmdb.dto.transaction.TransactionGroupVo;
 import neatlogic.framework.cmdb.enums.EditModeType;
+import neatlogic.framework.cmdb.enums.RelActionType;
 import neatlogic.framework.cmdb.enums.TransactionActionType;
 import neatlogic.framework.cmdb.exception.cientity.NewCiEntityNotFoundException;
 import neatlogic.framework.common.constvalue.InputFrom;
@@ -250,7 +251,7 @@ public class CiEntitySyncProcessComponent extends ProcessStepHandlerBase {
                                         if (CollectionUtils.isNotEmpty(relDataList)) {
                                             for (int i = 0; i < relDataList.size(); i++) {
                                                 JSONObject relEntityObj = relDataList.getJSONObject(i);
-                                                relEntityObj.put("action", "replace");
+                                                relEntityObj.put("action", RelActionType.REPLACE.getValue());
                                                 if (relEntityObj.getLong("ciEntityId") == null && StringUtils.isNotBlank(relEntityObj.getString("ciEntityUuid"))) {
                                                     CiEntityTransactionVo tmpVo = ciEntityTransactionMap.get(relEntityObj.getString("ciEntityUuid"));
                                                     if (tmpVo != null) {
-- 
Gitee