diff --git a/src/main/java/neatlogic/module/deploy/api/job/ListDeployJobModuleApi.java b/src/main/java/neatlogic/module/deploy/api/job/ListDeployJobModuleApi.java
index 72af29cd975c1ffa2ea2dd85b306b0631c6f2cae..0ceceb9dedbf7fe84bd3c241861a6d1f8103be1f 100644
--- a/src/main/java/neatlogic/module/deploy/api/job/ListDeployJobModuleApi.java
+++ b/src/main/java/neatlogic/module/deploy/api/job/ListDeployJobModuleApi.java
@@ -23,6 +23,7 @@ import neatlogic.framework.cmdb.dto.resourcecenter.ResourceVo;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.crossover.CrossoverServiceFactory;
 import neatlogic.framework.deploy.auth.DEPLOY_BASE;
+import neatlogic.framework.deploy.dto.app.DeployAppConfigVo;
 import neatlogic.framework.deploy.dto.app.DeployAppModuleVo;
 import neatlogic.framework.deploy.dto.app.DeployPipelineConfigVo;
 import neatlogic.framework.deploy.exception.DeployAppConfigNotFoundException;
@@ -40,10 +41,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -106,9 +104,16 @@ public class ListDeployJobModuleApi extends PrivateApiComponentBase {
                 throw new DeployAppConfigNotFoundException(appSystemId);
             }
             //查询拥有runner的模块id列表
-            List<Long> hasRunnerAppModuleIdList = deployAppConfigMapper.getAppModuleIdListHasRunnerByAppSystemIdAndModuleIdList(appSystemId, moduleResourceList.stream().map(ResourceVo::getId).collect(Collectors.toList()));
+            List<Long> appModuleIdList = moduleResourceList.stream().map(ResourceVo::getId).collect(Collectors.toList());
+            List<Long> hasRunnerAppModuleIdList = deployAppConfigMapper.getAppModuleIdListHasRunnerByAppSystemIdAndModuleIdList(appSystemId, appModuleIdList);
             /*补充当前模块是否有BUILD分类的工具，前端需要根据此标识(isHasBuildTypeTool) 调用不同的选择版本下拉接口*/
             //1、获取流水线
+            List<DeployAppConfigVo> deployAppConfigList = DeployPipelineConfigManager.init(appSystemId)
+                    .withAppModuleIdList(appModuleIdList)
+                    .withEnvIdList(Collections.singletonList(envId))
+                    .isHasBuildOrDeployTypeTool(true)
+                    .isUpdateConfig(false)
+                    .getDeployAppConfigList();
 //            Map<String, DeployAppConfigVo> appConfigVoMap = appConfigVoList.stream().collect(Collectors.toMap(o -> o.getAppSystemId().toString() + "-" + o.getAppModuleId().toString() + "-" + o.getEnvId().toString(), e -> e));
             for (ResourceVo resourceVo : moduleResourceList) {
                 DeployAppModuleVo appModuleVo = new DeployAppModuleVo(resourceVo.getId(), resourceVo.getName(), resourceVo.getAbbrName());
@@ -123,12 +128,13 @@ public class ListDeployJobModuleApi extends PrivateApiComponentBase {
 //                if (configVo == null) {
 //                    throw new DeployAppConfigNotFoundException(appSystemId);
 //                }
-                DeployPipelineConfigVo pipelineConfigVo = DeployPipelineConfigManager.init(appSystemId)
-                        .withAppModuleId(appModuleVo.getId())
-                        .withEnvId(envId)
-                        .isHasBuildOrDeployTypeTool(true)
-                        .isUpdateConfig(false)
-                        .getConfig();
+//                DeployPipelineConfigVo pipelineConfigVo = DeployPipelineConfigManager.init(appSystemId)
+//                        .withAppModuleId(appModuleVo.getId())
+//                        .withEnvId(envId)
+//                        .isHasBuildOrDeployTypeTool(true)
+//                        .isUpdateConfig(false)
+//                        .getConfig();
+                DeployPipelineConfigVo pipelineConfigVo = getDeployPipelineConfigVo(deployAppConfigList, appSystemId, appModuleVo.getId(), envId);
                 if (pipelineConfigVo == null) {
                     throw new DeployAppConfigNotFoundException(appSystemId);
                 }
@@ -178,6 +184,31 @@ public class ListDeployJobModuleApi extends PrivateApiComponentBase {
 
         return returnAppModuleVoList;
     }
+
+    private DeployPipelineConfigVo getDeployPipelineConfigVo(List<DeployAppConfigVo> deployAppConfigList, Long appSystemId, Long appModuleId, Long envId) {
+        for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) {
+            if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId)
+                    && Objects.equals(deployAppConfigVo.getAppModuleId(), appModuleId)
+                    && Objects.equals(deployAppConfigVo.getEnvId(), envId)) {
+                return deployAppConfigVo.getConfig();
+            }
+        }
+        for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) {
+            if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId)
+                    && Objects.equals(deployAppConfigVo.getAppModuleId(), appModuleId)
+                    && Objects.equals(deployAppConfigVo.getEnvId(), 0L)) {
+                return deployAppConfigVo.getConfig();
+            }
+        }
+        for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) {
+            if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId)
+                    && Objects.equals(deployAppConfigVo.getAppModuleId(), 0L)
+                    && Objects.equals(deployAppConfigVo.getEnvId(), 0L)) {
+                return deployAppConfigVo.getConfig();
+            }
+        }
+        return null;
+    }
 }
 
 
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java
index 1c254c17cd2a30e51dac4c6c5894a3889c34419f..0e5461357dd37497cc48ca2a82f5adc6c3e46745 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.java
@@ -59,6 +59,8 @@ public interface DeployAppConfigMapper extends IDeployAppConfigCrossoverMapper {
 
     List<DeployAppConfigVo> getAppConfigList(DeployAppConfigVo configVo);
 
+    List<DeployAppConfigVo> getAppConfigListByAppSystemIdAndAppModuleIdListAndEnvIdList(@Param("appSystemId") Long appSystemId, @Param("appModuleIdList") List<Long> appModuleIdList, @Param("envIdList") List<Long> envIdList);
+
     int getAllDeployAppConfigCount();
 
     List<DeployAppConfigVo> getAllAppConfigListByPage(BasePageVo searchVo);
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
index e0bce8c0ba05f745bf32a3bdb4ac69c5ba90fe42..b861e8bae9f259625c896c448c1946f8619855f5 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
@@ -1017,6 +1017,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         FROM `deploy_app_config`
         WHERE `app_system_id` = #{appSystemId}
     </select>
+    <select id="getAppConfigListByAppSystemIdAndAppModuleIdListAndEnvIdList"
+            resultType="neatlogic.framework.deploy.dto.app.DeployAppConfigVo" useCache="false">
+        SELECT `id`,
+        `app_system_id` as appSystemId,
+        `app_module_id` as appModuleId,
+        `env_id`        as envId,
+        `config`        as configStr,
+        `fcd`,
+        `fcu`,
+        `lcd`,
+        `lcu`
+        FROM `deploy_app_config`
+        WHERE `app_system_id` = #{appSystemId}
+        <if test="appModuleIdList != null and appModuleIdList.size() > 0">
+            and `app_module_id` IN
+            <foreach collection="appModuleIdList" item="appModuleId" open="(" separator="," close=")">
+                #{appModuleId}
+            </foreach>
+        </if>
+        <if test="envIdList != null and envIdList.size() > 0">
+            and `env_id` IN
+            <foreach collection="envIdList" item="envId" open="(" separator="," close=")">
+                #{envId}
+            </foreach>
+        </if>
+    </select>
 
     <select id="getAppConfigCountByAppSystemId" resultType="int" useCache="false">
         SELECT count(1) FROM `deploy_app_config` WHERE `app_system_id` = #{appSystemId}
diff --git a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java
index 415a55f8e03a0105cfb4638932047aeb573776c3..3aefbefedf1ef6b1333ca1dd54c36820b55758a5 100644
--- a/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java
+++ b/src/main/java/neatlogic/module/deploy/util/DeployPipelineConfigManager.java
@@ -73,6 +73,8 @@ public class DeployPipelineConfigManager {
         private final Long appSystemId;
         private Long appModuleId = 0L;
         private Long envId = 0L;
+        private final List<Long> appModuleIdList = new ArrayList<>();
+        private final List<Long> envIdList = new ArrayList<>();
         private boolean isAppSystemDraft;
         private boolean isAppModuleDraft;
         private boolean isEnvDraft;
@@ -103,6 +105,20 @@ public class DeployPipelineConfigManager {
             return this;
         }
 
+        public Builder withAppModuleIdList(List<Long> appModuleIdList) {
+            if (CollectionUtils.isNotEmpty(appModuleIdList)) {
+                this.appModuleIdList.addAll(appModuleIdList);
+            }
+            return this;
+        }
+
+        public Builder withEnvIdList(List<Long> envIdList) {
+            if (CollectionUtils.isNotEmpty(envIdList)) {
+                this.envIdList.addAll(envIdList);
+            }
+            return this;
+        }
+
         public Builder withAppSystemDraft(boolean isAppSystemDraft) {
             this.isAppSystemDraft = isAppSystemDraft;
             return this;
@@ -183,6 +199,72 @@ public class DeployPipelineConfigManager {
             }
             return deployPipelineConfig;
         }
+
+        public List<DeployAppConfigVo> getDeployAppConfigList() {
+            List<DeployAppConfigVo> resultList = new ArrayList<>();
+            if (!appModuleIdList.contains(0L)) {
+                appModuleIdList.add(0L);
+            }
+            if (!envIdList.contains(0L)) {
+                envIdList.add(0L);
+            }
+            List<DeployAppConfigVo> deployAppConfigList = deployAppConfigMapper.getAppConfigListByAppSystemIdAndAppModuleIdListAndEnvIdList(appSystemId, appModuleIdList, envIdList);
+            for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) {
+                Long appModuleId = deployAppConfigVo.getAppModuleId();
+                Long envId = deployAppConfigVo.getEnvId();
+                String targetLevel;
+                DeployPipelineConfigVo appConfig;
+                DeployPipelineConfigVo moduleOverrideConfig = null;
+                DeployPipelineConfigVo envOverrideConfig = null;
+                if (appModuleId == 0L && envId == 0L) {
+                    targetLevel = "应用";
+                    //查询应用层流水线配置信息
+                    appConfig = getDeployPipelineConfigVo(appSystemId, appModuleId, envId, deployAppConfigList);
+                    if (appConfig == null) {
+                        appConfig = new DeployPipelineConfigVo();
+                    }
+                } else if (appModuleId == 0L) {
+                    // 如果是访问环境层配置信息，moduleId不能为空
+                    throw new ParamNotExistsException("moduleId");
+                } else if (envId == 0L) {
+                    targetLevel = "模块";
+                    //查询应用层配置信息
+                    appConfig = getDeployPipelineConfigVo(appSystemId, 0L, 0L, deployAppConfigList);
+                    if (appConfig == null) {
+                        appConfig = new DeployPipelineConfigVo();
+                    }
+                    moduleOverrideConfig = getDeployPipelineConfigVo(appSystemId, appModuleId, envId, deployAppConfigList);
+                } else {
+                    targetLevel = "环境";
+                    //查询应用层配置信息
+                    appConfig = getDeployPipelineConfigVo(appSystemId, 0L, 0L, deployAppConfigList);
+                    if (appConfig == null) {
+                        appConfig = new DeployPipelineConfigVo();
+                    }
+                    moduleOverrideConfig = getDeployPipelineConfigVo(appSystemId, appModuleId, 0L, deployAppConfigList);
+                    envOverrideConfig = getDeployPipelineConfigVo(appSystemId, appModuleId, envId, deployAppConfigList);
+                }
+                DeployPipelineConfigVo deployPipelineConfigVo = mergeDeployPipelineConfig(appConfig, moduleOverrideConfig, envOverrideConfig, targetLevel, profileIdList);
+                DeployAppConfigVo deployAppConfig = new DeployAppConfigVo();
+                deployAppConfig.setAppSystemId(appSystemId);
+                deployAppConfig.setAppModuleId(appModuleId);
+                deployAppConfig.setEnvId(envId);
+                deployAppConfig.setConfig(deployPipelineConfigVo);
+                resultList.add(deployAppConfig);
+            }
+            return resultList;
+        }
+    }
+
+    private static DeployPipelineConfigVo getDeployPipelineConfigVo(Long appSystemId, Long appModuleId, Long envId, List<DeployAppConfigVo> deployAppConfigList) {
+        for (DeployAppConfigVo deployAppConfigVo : deployAppConfigList) {
+            if (Objects.equals(deployAppConfigVo.getAppSystemId(), appSystemId)
+                    && Objects.equals(deployAppConfigVo.getAppModuleId(), appModuleId)
+                    && Objects.equals(deployAppConfigVo.getEnvId(), envId)) {
+                return deployAppConfigVo.getConfig();
+            }
+        }
+        return null;
     }
 
     /**