Skip to content

Commit fc22145

Browse files
committed
Address review comment
1 parent e2fd343 commit fc22145

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2332,6 +2332,7 @@ public Pair<List<Long>, Integer> searchForServerIdsAndCount(ListHostsCmd cmd) {
23322332
hostSearchBuilder.and().op("keywordName", hostSearchBuilder.entity().getName(), SearchCriteria.Op.LIKE);
23332333
hostSearchBuilder.or("keywordStatus", hostSearchBuilder.entity().getStatus(), SearchCriteria.Op.LIKE);
23342334
hostSearchBuilder.or("keywordType", hostSearchBuilder.entity().getType(), SearchCriteria.Op.LIKE);
2335+
hostSearchBuilder.or("keywordVersion", hostSearchBuilder.entity().getVersion(), SearchCriteria.Op.LIKE);
23352336
hostSearchBuilder.cp();
23362337
}
23372338

@@ -2362,6 +2363,7 @@ public Pair<List<Long>, Integer> searchForServerIdsAndCount(ListHostsCmd cmd) {
23622363
sc.setParameters("keywordName", "%" + keyword + "%");
23632364
sc.setParameters("keywordStatus", "%" + keyword + "%");
23642365
sc.setParameters("keywordType", "%" + keyword + "%");
2366+
sc.setParameters("keywordVersion", "%" + keyword + "%");
23652367
}
23662368

23672369
if (id != null) {
@@ -5404,6 +5406,7 @@ protected Pair<List<ManagementServerJoinVO>, Integer> listManagementServersInter
54045406
Long id = cmd.getId();
54055407
String name = cmd.getHostName();
54065408
String version = cmd.getVersion();
5409+
String keyword = cmd.getKeyword();
54075410

54085411
SearchBuilder<ManagementServerJoinVO> sb = managementServerJoinDao.createSearchBuilder();
54095412
SearchCriteria<ManagementServerJoinVO> sc = sb.create();
@@ -5416,6 +5419,9 @@ protected Pair<List<ManagementServerJoinVO>, Integer> listManagementServersInter
54165419
if (version != null) {
54175420
sc.addAnd("version", SearchCriteria.Op.EQ, version);
54185421
}
5422+
if (keyword != null) {
5423+
sc.addAnd("keywordVersion", SearchCriteria.Op.LIKE, "%" + keyword + "%");
5424+
}
54195425
return managementServerJoinDao.searchAndCount(sc, null);
54205426
}
54215427

0 commit comments

Comments
 (0)