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 13a909928a2fd2d9133fbe1f05ec34549b41dcf0..1f5a4b4e3a00ed64b19633532eefa1a64d73394b 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 .--> 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 .--> 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 .--> 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 .--> saa.`app_module_abbr_name` as appModuleAbbrName, 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 .--> 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 5ed7bb537428bd8d6acadd4feb012ead6ada9400..3026772d1f9ad669995041ebe72449715f7882d1 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 .--> 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 .--> 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 .--> 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