From ff005e8993893dce2f78a1401e81c9ee92868c54 Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Thu, 4 Jan 2024 17:52:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-ITSM-?= =?UTF-8?q?CMDB=E5=90=8C=E6=AD=A5=E8=8A=82=E7=82=B9-=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E5=AD=90=E6=A8=A1=E5=9E=8B=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1059939512975360]后端-ITSM-CMDB同步节点-关系映射子模型处理 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1059939512975360 --- .../transaction/CiEntityTransactionVo.java | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/main/java/neatlogic/framework/cmdb/dto/transaction/CiEntityTransactionVo.java b/src/main/java/neatlogic/framework/cmdb/dto/transaction/CiEntityTransactionVo.java index 165ecc3d..4ae8cf48 100644 --- a/src/main/java/neatlogic/framework/cmdb/dto/transaction/CiEntityTransactionVo.java +++ b/src/main/java/neatlogic/framework/cmdb/dto/transaction/CiEntityTransactionVo.java @@ -288,17 +288,24 @@ public class CiEntityTransactionVo implements Serializable { if (MapUtils.isNotEmpty(relEntityData) && relEntityData.containsKey("rel" + direction + "_" + relId) && relEntityData.getJSONObject("rel" + direction + "_" + relId).containsKey("valueList")) { JSONArray relList = relEntityData.getJSONObject("rel" + direction + "_" + relId).getJSONArray("valueList"); if (CollectionUtils.isNotEmpty(relList)) { - List removeList = new ArrayList<>(); - for (int i = 0; i < relList.size(); i++) { +// List removeList = new ArrayList<>(); +// for (int i = 0; i < relList.size(); i++) { +// JSONObject relObj = relList.getJSONObject(i); +// //如果是新增加目标则不会有ciEntityId,所以必须要判断ciEntityId是否为空 +// if (relObj.containsKey("ciEntityId") && relObj.getLong("ciEntityId").equals(targetId)) { +// removeList.add(i); +// } +// } +// for (int index : removeList) { +// relList.remove(index); +// } + for (int i = relList.size() - 1; i >= 0; i--) { JSONObject relObj = relList.getJSONObject(i); //如果是新增加目标则不会有ciEntityId,所以必须要判断ciEntityId是否为空 if (relObj.containsKey("ciEntityId") && relObj.getLong("ciEntityId").equals(targetId)) { - removeList.add(i); + relList.remove(i); } } - for (int index : removeList) { - relList.remove(index); - } if (CollectionUtils.isEmpty(relList)) { relEntityData.remove("rel" + direction + "_" + relId); } -- Gitee