From ebd2dd4b67b1dffaa54e04dde3d1e0b19851dd2f Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 1 Nov 2024 17:59:10 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E4=B8=8E=E5=8F=91=E5=B8=83=E4=B8=AD=E6=A8=A1=E5=9D=97=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=8E=AF=E5=A2=83=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1280490982572032]集成与发布中模块添加环境报错 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1280490982572032
---
 .../cmdb/dao/mapper/globalattr/GlobalAttrMapper.java      | 2 ++
 .../cmdb/dao/mapper/globalattr/GlobalAttrMapper.xml       | 8 ++++++++
 .../process/stephandler/CmdbSyncProcessComponent.java     | 4 +---
 3 files changed, 11 insertions(+), 3 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 36d3b9ac..9843939c 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
@@ -37,6 +37,8 @@ public interface GlobalAttrMapper extends IGlobalAttrCrossoverMapper {
 
     GlobalAttrVo getGlobalAttrById(Long id);
 
+    List<GlobalAttrItemVo> getAllGlobalAttrItemByAttrId(Long attrId);
+
     List<GlobalAttrItemVo> searchGlobalAttrItem(GlobalAttrItemVo globalAttrItemVo);
 
     GlobalAttrItemVo getGlobalAttrItemById(Long id);
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 ad1a914d..a1f307cb 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
@@ -118,6 +118,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         order by sort
     </select>
 
+    <select id="getAllGlobalAttrItemByAttrId" parameterType="java.lang.Long"
+            resultType="neatlogic.framework.cmdb.dto.globalattr.GlobalAttrItemVo">
+        select id, value, attr_id as attrId, sort
+        from cmdb_global_attritem
+        where attr_id = #{attrId}
+        order by sort
+    </select>
+
 
     <select id="searchGlobalAttrItem" parameterType="neatlogic.framework.cmdb.dto.globalattr.GlobalAttrItemVo"
             resultType="neatlogic.framework.cmdb.dto.globalattr.GlobalAttrItemVo">
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 18ca4312..bfd90507 100644
--- a/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
+++ b/src/main/java/neatlogic/module/cmdb/process/stephandler/CmdbSyncProcessComponent.java
@@ -910,9 +910,7 @@ public class CmdbSyncProcessComponent extends ProcessStepHandlerBase {
                     if (valueObj instanceof JSONObject) {
                         valueList.add(valueObj);
                     } else {
-                        GlobalAttrItemVo globalAttrItemVo = new GlobalAttrItemVo();
-                        globalAttrItemVo.setAttrId(globalAttrVo.getId());
-                        List<GlobalAttrItemVo> itemList = globalAttrMapper.searchGlobalAttrItem(globalAttrItemVo);
+                        List<GlobalAttrItemVo> itemList = globalAttrMapper.getAllGlobalAttrItemByAttrId(globalAttrVo.getId());
                         for (GlobalAttrItemVo item : itemList) {
                             if (Objects.equals(item.getValue(), valueObj)
                                     || Objects.equals(item.getId().toString(), valueObj.toString())) {
-- 
Gitee