From 7d3a8d571bc88e8b5f66e29416f6ea46014298b4 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Wed, 9 Oct 2024 18:38:47 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=B7=BB=E5=8A=A0=E5=AE=9E=E4=BE=8B=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1263844234592256]应用配置添加实例失败 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1263844234592256
---
 .../cmdb/dao/mapper/globalattr/GlobalAttrMapper.java     | 2 ++
 .../cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml      | 6 ++++++
 .../process/stephandler/CmdbSyncProcessComponent.java    | 9 +++------
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.java b/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.java
index 6cbd1f68..36d3b9ac 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.java
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.java
@@ -39,6 +39,8 @@ public interface GlobalAttrMapper extends IGlobalAttrCrossoverMapper {
 
     List<GlobalAttrItemVo> searchGlobalAttrItem(GlobalAttrItemVo globalAttrItemVo);
 
+    GlobalAttrItemVo getGlobalAttrItemById(Long id);
+
     List<GlobalAttrVo> searchGlobalAttr(GlobalAttrVo globalAttrVo);
 
     List<GlobalAttrEntityVo> getGlobalAttrByCiEntityId(Long ciEntityId);
diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml
index 820075e7..3dd69296 100644
--- a/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml
+++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml
@@ -137,6 +137,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         limit #{startNum}, #{pageSize}
     </select>
 
+    <select id="getGlobalAttrItemById" parameterType="java.lang.Long"
+            resultType="neatlogic.framework.cmdb.dto.globalattr.GlobalAttrItemVo">
+        select id, value, attr_id as attrId, sort
+        from cmdb_global_attritem
+        where id = #{value}
+    </select>
 
     <select id="searchGlobalAttr" parameterType="neatlogic.framework.cmdb.dto.globalattr.GlobalAttrVo"
             resultType="neatlogic.framework.cmdb.dto.globalattr.GlobalAttrVo">
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 5819dc1f..40f7b0cd 100644
--- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
+++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
@@ -909,8 +909,9 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase {
                     if (valueObj instanceof JSONObject) {
                         valueList.add(valueObj);
                     } else {
-//                        boolean flag = false;
-                        List<GlobalAttrItemVo> itemList = globalAttrVo.getItemList();
+                        GlobalAttrItemVo globalAttrItemVo = new GlobalAttrItemVo();
+                        globalAttrItemVo.setAttrId(globalAttrVo.getId());
+                        List<GlobalAttrItemVo> itemList = globalAttrMapper.searchGlobalAttrItem(globalAttrItemVo);
                         for (GlobalAttrItemVo item : itemList) {
                             if (Objects.equals(item.getValue(), valueObj)
                                     || Objects.equals(item.getId().toString(), valueObj.toString())) {
@@ -920,12 +921,8 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase {
                                 jsonObj.put("sort", item.getSort());
                                 jsonObj.put("attrId", globalAttrVo.getId());
                                 valueList.add(jsonObj);
-//                                flag = true;
                             }
                         }
-//                        if (!flag) {
-//                            throw new GlobalAttrValueIrregularException(globalAttrVo, valueObj.toString());
-//                        }
                     }
                 }
             }
-- 
Gitee