diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvApi.java
index b2d296d68007c97c04ca214973795c6130f2c6d7..1b747f3c510cbaa76846927b79db93980bb69270 100644
--- a/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvApi.java
+++ b/src/main/java/neatlogic/module/deploy/api/appconfig/env/SaveDeployAppConfigEnvApi.java
@@ -109,7 +109,9 @@ public class SaveDeployAppConfigEnvApi extends PrivateApiComponentBase {
         List<GlobalAttrVo> globalAttrList = globalAttrCrossoverMapper.searchGlobalAttr(globalAttrVo);
         if (CollectionUtils.isNotEmpty(globalAttrList)) {
             globalAttrVo = globalAttrList.get(0);
-            globalAttrItemList = globalAttrVo.getItemList();
+            GlobalAttrItemVo globalAttrItemVo = new GlobalAttrItemVo();
+            globalAttrItemVo.setAttrId(globalAttrVo.getId());
+            globalAttrItemList = globalAttrCrossoverMapper.searchGlobalAttrItem(globalAttrItemVo);
         }
         List<Long> globalAttrItemIdList = globalAttrItemList.stream().map(GlobalAttrItemVo::getId).collect(Collectors.toList());
         List<Long> notExistIdList = ListUtils.removeAll(envIdList, globalAttrItemIdList);
diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java
index 93017823115cec019af38004e19af01edab20431..b62cae56fa11bf9db98b37aae1f78661e80613b8 100644
--- a/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java
+++ b/src/main/java/neatlogic/module/deploy/api/appconfig/module/ListDeployAppConfigAppEnvApi.java
@@ -98,7 +98,9 @@ public class ListDeployAppConfigAppEnvApi extends PrivateApiComponentBase {
             List<GlobalAttrVo> globalAttrList = globalAttrCrossoverMapper.searchGlobalAttr(globalAttrVo);
             if (CollectionUtils.isNotEmpty(globalAttrList)) {
                 globalAttrVo = globalAttrList.get(0);
-                globalAttrItemList = globalAttrVo.getItemList();
+                GlobalAttrItemVo globalAttrItemVo = new GlobalAttrItemVo();
+                globalAttrItemVo.setAttrId(globalAttrVo.getId());
+                globalAttrItemList = globalAttrCrossoverMapper.searchGlobalAttrItem(globalAttrItemVo);
             }
             for (GlobalAttrItemVo globalAttrItemVo : globalAttrItemList) {
                 Long id = globalAttrItemVo.getId();
diff --git a/src/main/java/neatlogic/module/deploy/service/DeployAppConfigServiceImpl.java b/src/main/java/neatlogic/module/deploy/service/DeployAppConfigServiceImpl.java
index 765f40c97d821dad177e9f0a76d39fa8ff43aa3a..506047fbfeeb8c8316466b4d37b521eb7545c9f9 100644
--- a/src/main/java/neatlogic/module/deploy/service/DeployAppConfigServiceImpl.java
+++ b/src/main/java/neatlogic/module/deploy/service/DeployAppConfigServiceImpl.java
@@ -1,5 +1,7 @@
 package neatlogic.module.deploy.service;
 
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.cmdb.crossover.*;
 import neatlogic.framework.cmdb.dto.ci.AttrVo;
 import neatlogic.framework.cmdb.dto.ci.CiVo;
@@ -22,8 +24,6 @@ import neatlogic.framework.dto.runner.RunnerMapVo;
 import neatlogic.framework.exception.runner.RunnerGroupRunnerNotFoundException;
 import neatlogic.framework.exception.type.ParamIrregularException;
 import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -330,21 +330,16 @@ public class DeployAppConfigServiceImpl implements DeployAppConfigService {
             if (envId == null) {
                 continue;
             }
-            boolean flag = false;
             JSONArray valueList = new JSONArray();
-            List<GlobalAttrItemVo> itemList = globalAttrVo.getItemList();
-            for (GlobalAttrItemVo item : itemList) {
-                if (Objects.equals(item.getId(), envId)) {
-                    JSONObject jsonObj = new JSONObject();
-                    jsonObj.put("id", item.getId());
-                    jsonObj.put("value", item.getValue());
-                    jsonObj.put("sort", item.getSort());
-                    jsonObj.put("attrId", globalAttrVo.getId());
-                    valueList.add(jsonObj);
-                    flag = true;
-                }
-            }
-            if (!flag) {
+            GlobalAttrItemVo globalAttrItemVo = globalAttrCrossoverMapper.getGlobalAttrItemById(envId);
+            if (globalAttrItemVo != null) {
+                JSONObject jsonObj = new JSONObject();
+                jsonObj.put("id", globalAttrItemVo.getId());
+                jsonObj.put("value", globalAttrItemVo.getValue());
+                jsonObj.put("sort", globalAttrItemVo.getSort());
+                jsonObj.put("attrId", globalAttrVo.getId());
+                valueList.add(jsonObj);
+            } else {
                 throw new GlobalAttrValueIrregularException(globalAttrVo, envId.toString());
             }
             JSONObject globalAttrEntity = new JSONObject();