From 7d5100ab7a12fd95e0851d0921450c8430a153c7 Mon Sep 17 00:00:00 2001 From: "1437892690@qq.com" <1437892690@qq.com> Date: Tue, 12 Nov 2024 17:36:28 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E5=A4=8D]=20=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=BA=94=E7=94=A8=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E4=B8=AD=E6=90=9C=E7=B4=A2=E5=BA=94=E7=94=A8=E6=97=B6=E4=BC=9A?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=A8=A1=E5=9D=97=E8=A2=AB=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E6=8E=89=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关联 #[1288457198993408]配置管理-应用清单中搜索应用时会导致模块被过滤掉了 http://192.168.0.96:8090/demo/rdm.html#/bug-detail/939050947543040/939050947543057/1288457198993408 --- .../app/ListAppSystemForTreeApi.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/app/ListAppSystemForTreeApi.java b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/app/ListAppSystemForTreeApi.java index ee0eed52..dcc095bb 100644 --- a/src/main/java/neatlogic/module/cmdb/api/resourcecenter/app/ListAppSystemForTreeApi.java +++ b/src/main/java/neatlogic/module/cmdb/api/resourcecenter/app/ListAppSystemForTreeApi.java @@ -83,6 +83,14 @@ public class ListAppSystemForTreeApi extends PrivateApiComponentBase { return TableResultUtil.getResult(tbodyList, searchVo); } tbodyList = resourceMapper.getAppSystemListByIdList(appSystemIdList); + List hasModuleAppSystemIdList = resourceMapper.getHasModuleAppSystemIdListByAppSystemIdList(appSystemIdList); + if (CollectionUtils.isNotEmpty(hasModuleAppSystemIdList)) { + for (AppSystemVo appSystemVo : tbodyList) { + if (hasModuleAppSystemIdList.contains(appSystemVo.getId())) { + appSystemVo.setIsHasModule(1); + } + } + } if (StringUtils.isNotEmpty(searchVo.getKeyword())) { List appModuleList = resourceMapper.getAppModuleListByKeywordAndAppSystemIdList(keyword, appSystemIdList); if (CollectionUtils.isNotEmpty(appModuleList)) { @@ -98,15 +106,6 @@ public class ListAppSystemForTreeApi extends PrivateApiComponentBase { } } } - } else { - List hasModuleAppSystemIdList = resourceMapper.getHasModuleAppSystemIdListByAppSystemIdList(appSystemIdList); - if (CollectionUtils.isNotEmpty(hasModuleAppSystemIdList)) { - for (AppSystemVo appSystemVo : tbodyList) { - if (hasModuleAppSystemIdList.contains(appSystemVo.getId())) { - appSystemVo.setIsHasModule(1); - } - } - } } } return TableResultUtil.getResult(tbodyList, searchVo); -- Gitee