From 9288539be93aa37b78159cbdf6761ddace630dcb Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 23 Sep 2024 12:53:58 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E4=B8=8E=E5=8F=91=E5=B8=83=E7=9A=84=E9=80=9A=E7=9F=A5=E7=AD=96?=
 =?UTF-8?q?=E7=95=A5=E5=8F=82=E6=95=B0=E2=80=9C=E7=8E=AF=E5=A2=83=E2=80=9D?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1252049465868288]集成与发布的通知策略参数“环境”没有值 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1252049465868288
---
 .../module/deploy/dao/mapper/DeployJobMapper.xml       | 10 +++++-----
 .../module/deploy/dao/mapper/DeployPipelineMapper.xml  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml
index 13a90992..1f5a4b4e 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployJobMapper.xml
@@ -24,7 +24,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                a.app_module_id as appModuleId,
                c.name          as appModuleName,
                a.env_id        as envId,
-               d.name          as envName,
+               d.`value`          as envName,
                a.scenario_id   as scenarioId,
                e.name          as scenarioName,
                a.version,
@@ -61,7 +61,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                a.app_system_id      as appSystemId,
                a.app_module_id      as appModuleId,
                a.env_id             as envId,
-               d.name               as envName,
+               d.`value`               as envName,
                a.scenario_id        as scenarioId,
                e.name               as scenarioName,
                a.version,
@@ -82,7 +82,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         app_module_id as appModuleId,
         c.name as appModuleName,
         env_id as envId,
-        d.name as envName,
+        d.`value` as envName,
         version,
         build_no as buildNo,
         runner_map_id as runnerMapId
@@ -330,7 +330,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
             saa.`app_module_abbr_name` as appModuleAbbrName,
         </if>
         a.`env_id` as envId,
-        d.`name` as envName,
+        d.`value` as envName,
         a.`version`,
         e.`name` as scenarioName
         FROM
@@ -524,7 +524,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                saa.`app_module_name` AS jobAppModuleName,
                saa.`app_module_abbr_name` AS jobAppModuleAbbrName,
                f.`env_id`        as jobEnvId,
-               i.`name`          as jobEnvName,
+               i.`value`          as jobEnvName,
                j.`sort`          AS jobGroupSort,
                k.`id`            AS jobPhaseId,
                k.`name`          AS jobPhaseName,
diff --git a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployPipelineMapper.xml b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployPipelineMapper.xml
index 5ed7bb53..3026772d 100644
--- a/src/main/java/neatlogic/module/deploy/dao/mapper/DeployPipelineMapper.xml
+++ b/src/main/java/neatlogic/module/deploy/dao/mapper/DeployPipelineMapper.xml
@@ -30,7 +30,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                dpj.sort                   as sort,
                saa.`name`                 as appSystemName,
                saa.`abbr_name`            as appSystemAbbrName,
-               cienv.`name`               as envName,
+               cienv.`value`               as envName,
                saa.`app_module_name`      as appModuleName,
                saa.`app_module_abbr_name` as appModuleAbbrName,
                aes.`name`                 as scenarioName
@@ -68,7 +68,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
         dpj.config as configStr,
         dpj.sort as sort,
         ciapp.`name` as appSystemName,
-        cienv.`name` as envName,
+        cienv.`value` as envName,
         cimodule.`name` as appModuleName,
         aes.`name` as scenarioName
         FROM deploy_pipeline_jobtemplate AS dpj
@@ -156,7 +156,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
                saa.`abbr_name` AS jobTemplateAppAbbrName,
                saa.`app_module_name` AS jobTemplateModuleName,
                saa.`app_module_abbr_name` AS jobTemplateModuleAbbrName,
-               cienv.`name`      as jobTemplateEnvName,
+               cienv.`value`      as jobTemplateEnvName,
                dpa.auth_uuid     as authUuid,
                dpa.type          as authType
         FROM deploy_pipeline AS dp
-- 
Gitee