From df7ab5c312287f8367a7d37ba0fca75221dafced Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Wed, 13 Dec 2023 11:59:25 +0800 Subject: [PATCH 1/2] =?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 --- .../mapper/resourcecenter/ResourceMapper.xml | 14 ++++++------- .../resources/cmdb/sqlscript/dml.sql | 20 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml index 133bd2ff..e97e65c8 100644 --- a/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml +++ b/src/main/java/neatlogic/module/cmdb/dao/mapper/resourcecenter/ResourceMapper.xml @@ -1083,7 +1083,7 @@ limitations under the License. a.`value` AS NAME, a.`sort` AS envSeqNo FROM `cmdb_global_attritem` a - JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env' + JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'app_environment' WHERE a.`id` = #{value} @@ -1093,7 +1093,7 @@ limitations under the License. a.`value` AS NAME, a.`sort` AS envSeqNo FROM `cmdb_global_attritem` a - JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env' + JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'app_environment' where a.`id` in #{value} @@ -1186,7 +1186,7 @@ limitations under the License. a.`value` AS NAME, a.`sort` AS envSeqNo FROM `cmdb_global_attritem` a - JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env' + JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'app_environment' where a.`value` = #{value} @@ -1197,14 +1197,14 @@ limitations under the License. a.`value` AS envName, a.`sort` AS envSeqNo FROM `cmdb_global_attritem` a - JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'env' + JOIN `cmdb_global_attr` b ON b.`id` = a.`attr_id` AND b.`name` = 'app_environment'