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 917d10a58ffb305e1f4fab7c76e9e06bb3bbdf63..fb007d1ae884959df27d003a8cad5994e63f8b73 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 a0c69fbe31bd938c4c286eb2fa98b920d94c68ae..c648fc1befd2181108543ae75fb734ae97b99840 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; }