OpenSource/hertzbeat
Public Access
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[manager,webapp]fix 页面全局监控搜索结果异常 (#28)

Browse Source
This commit is contained in:
tomsun28
2022-03-15 15:00:22 +08:00
committed by GitHub
parent 9eb3b9842d
commit 540f4bcbf4
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manager/src/main/java/com/usthe/manager/controller/MonitorsController.java
View File

@@ -79,9 +79,17 @@ public class MonitorsController {
orList.add(predicateName);
}
Predicate[] orPredicates = new Predicate[orList.size()];
Predicate orPredicate = criteriaBuilder.and(orList.toArray(orPredicates));
Predicate orPredicate = criteriaBuilder.or(orList.toArray(orPredicates));
return query.where(andPredicate,orPredicate).getRestriction();
if (andPredicate.getExpressions().isEmpty() && orPredicate.getExpressions().isEmpty()) {
return query.where().getRestriction();
} else if (andPredicate.getExpressions().isEmpty()) {
return query.where(orPredicate).getRestriction();
} else if (orPredicate.getExpressions().isEmpty()) {
return query.where(andPredicate).getRestriction();
} else {
return query.where(andPredicate,orPredicate).getRestriction();
}
};
// 分页是必须的
Sort sortExp = Sort.by(new Sort.Order(Sort.Direction.fromString(order), sort));