From ba0cbbffc269f865a33517a57afd33f9cd680823 Mon Sep 17 00:00:00 2001
From: linbangquan <1437892690@qq.com>
Date: Tue, 12 Dec 2023 23:17:15 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E5=90=8E=E7=AB=AF-?=
 =?UTF-8?q?=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95=E4=B8=AD=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E7=9A=84=E5=8F=96=E5=80=BC=EF=BC=8C=E7=94=B1=E8=BD=AF=E4=BB=B6?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=A8=A1=E5=9E=8B=E7=9A=84=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E6=94=B9=E6=88=90=E5=85=A8=E5=B1=80=E5=8F=98?=
 =?UTF-8?q?=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1045002732404736]后端-应用清单中环境的取值，由软件服务模型的环境属性改成全局变量 http://192.168.0.96:8090/demo/rdm.html#/task-detail/939050947543040/939050947543050/1045002732404736
---
 .../system/ListDeployAppConfigAuthorityApi.java    | 14 +++++++++-----
 .../deploy/dao/mapper/DeployAppConfigMapper.xml    |  5 +++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java b/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java
index e1227686..d6459fbe 100644
--- a/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java
+++ b/src/main/java/neatlogic/module/deploy/api/appconfig/system/ListDeployAppConfigAuthorityApi.java
@@ -32,6 +32,7 @@ import neatlogic.framework.restful.constvalue.OperationTypeEnum;
 import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase;
 import neatlogic.module.deploy.dao.mapper.DeployAppConfigMapper;
 import neatlogic.module.deploy.util.DeployPipelineConfigManager;
+import org.apache.commons.collections4.CollectionUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -90,11 +91,14 @@ public class ListDeployAppConfigAuthorityApi extends PrivateApiComponentBase {
                 throw new DeployAppConfigNotFoundException(appSystemId);
             }
             List<JSONObject> scenarioAuthList = new ArrayList<>();
-            for (AutoexecCombopScenarioVo scenarioVo : pipelineConfigVo.getScenarioList()) {
-                JSONObject scenarioValueText = new JSONObject();
-                scenarioValueText.put("text", scenarioVo.getScenarioName());
-                scenarioValueText.put("value", scenarioVo.getScenarioId());
-                scenarioAuthList.add(scenarioValueText);
+            List<AutoexecCombopScenarioVo> scenarioList = pipelineConfigVo.getScenarioList();
+            if (CollectionUtils.isNotEmpty(scenarioList)) {
+                for (AutoexecCombopScenarioVo scenarioVo : scenarioList) {
+                    JSONObject scenarioValueText = new JSONObject();
+                    scenarioValueText.put("text", scenarioVo.getScenarioName());
+                    scenarioValueText.put("value", scenarioVo.getScenarioId());
+                    scenarioAuthList.add(scenarioValueText);
+                }
             }
             returnObj.put("scenarioAuthList", scenarioAuthList);
 
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 0c5f3e9d..b6265b48 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployAppConfigMapper.xml
@@ -596,8 +596,9 @@ limitations under the License.
     <select id="getDeployAppHasNotEnvListByAppSystemIdAndModuleIdList"
             resultType="neatlogic.framework.deploy.dto.app.DeployAppEnvironmentVo" useCache="false">
         SELECT a.`id`,
-        a.`name`
-        FROM @{DATA_SCHEMA}.`scence_env` a
+        a.`value` as name
+        FROM `cmdb_global_attritem` a
+        JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env'
         where a.id not in(
         (
         SELECT
-- 
Gitee