diff --git a/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java b/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java index f14abd7b6426b560cfef7a42d3a0c9f99c531340..dfde5ca6df66135f78e7f2a7b863173372e13b74 100644 --- a/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java +++ b/src/main/java/neatlogic/module/cmdb/resourcecenter/datasource/handler/DefaultResourceCenterDataSourceImpl.java @@ -377,28 +377,28 @@ public class DefaultResourceCenterDataSourceImpl implements IResourceCenterDataS } } if (CollectionUtils.isNotEmpty(viewNameList)) { - ResourceSearchVo searchVo = new ResourceSearchVo(); - if (appSystemId != null) { - searchVo.setAppSystemId(appSystemId); - } - if (appModuleId != null) { - searchVo.setAppModuleId(appModuleId); - } - if (envId != null) { - searchVo.setEnvId(envId); - } - if (currentPage != null) { - searchVo.setCurrentPage(currentPage); - } - if (pageSize != null) { - searchVo.setPageSize(pageSize); - } - if (CollectionUtils.isNotEmpty(inspectStatusList)) { - searchVo.setInspectStatusList(inspectStatusList); - } for (String name : viewNameList) { ResourceEntityVo resourceEntityVo = resourceEntityMapper.getResourceEntityByName(name); if (resourceEntityVo != null) { + ResourceSearchVo searchVo = new ResourceSearchVo(); + if (appSystemId != null) { + searchVo.setAppSystemId(appSystemId); + } + if (appModuleId != null) { + searchVo.setAppModuleId(appModuleId); + } + if (envId != null) { + searchVo.setEnvId(envId); + } + if (currentPage != null) { + searchVo.setCurrentPage(currentPage); + } + if (pageSize != null) { + searchVo.setPageSize(pageSize); + } + if (CollectionUtils.isNotEmpty(inspectStatusList)) { + searchVo.setInspectStatusList(inspectStatusList); + } searchVo.setViewName(name); List fieldList = viewName2FieldListMap.get(name); List resourceList = getAppResourceList(searchVo, true);