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 ee0eed5220d3e2bad9aedf80b780c428215be2ed..dcc095bb03da6c80e55ce0a7f17d805fec395bc6 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<Long> 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<AppModuleVo> appModuleList = resourceMapper.getAppModuleListByKeywordAndAppSystemIdList(keyword, appSystemIdList);
                 if (CollectionUtils.isNotEmpty(appModuleList)) {
@@ -98,15 +106,6 @@ public class ListAppSystemForTreeApi extends PrivateApiComponentBase {
                         }
                     }
                 }
-            } else {
-                List<Long> 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);