From 5101a4a025acc0a191cb1cbed70e7edce4876edd Mon Sep 17 00:00:00 2001 From: linbangquan <1437892690@qq.com> Date: Wed, 28 Feb 2024 14:58:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E6=8C=89=E7=85=A7=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E8=BF=87=E6=BB=A4=EF=BC=8C=E6=93=8D=E4=BD=9C=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=9A=84=E8=BF=87=E6=BB=A4=E7=BB=93=E6=9E=9C=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1066701242728448]应用清单-按照环境过滤，操作系统的过滤结果异常 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1066701242728448 --- .../cmdb/dao/mapper/resourcecenter/ResourceMapper.xml | 5 ++++- .../resource/ResourceCenterResourceServiceImpl.java | 6 +++--- 2 files changed, 7 insertions(+), 4 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 917d10a5..fb007d1a 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 @@ -658,7 +658,10 @@ limitations under the License. a.`datacenter_name`, a.`cluster_id`, a.`cluster_type_id`, - a.`cluster_name` + a.`cluster_name`, + a.`env_id`, + a.`env_name`, + a.`env_seq_no` FROM @{DATA_SCHEMA}.`scence_os_detail_cluster` a WHERE a.`id` IN diff --git a/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java b/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java index a0c69fbe..c648fc1b 100644 --- a/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java +++ b/src/main/java/neatlogic/module/cmdb/service/resourcecenter/resource/ResourceCenterResourceServiceImpl.java @@ -967,9 +967,9 @@ public class ResourceCenterResourceServiceImpl implements IResourceCenterResourc } resultList.add(newFieldMappingVo); } - if (CollectionUtils.isNotEmpty(fieldNameList)) { - throw new ResourceViewFieldMappingException(viewName, fieldNameList); - } +// if (CollectionUtils.isNotEmpty(fieldNameList)) { +// throw new ResourceViewFieldMappingException(viewName, fieldNameList); +// } newConfig.setFieldMappingList(resultList); return newConfig; } -- Gitee