diff --git a/src/main/java/cn/lihongjie/coal/weightDeviceData/service/WeightDeviceDataService.java b/src/main/java/cn/lihongjie/coal/weightDeviceData/service/WeightDeviceDataService.java index 5017808f..2d8ba8ce 100644 --- a/src/main/java/cn/lihongjie/coal/weightDeviceData/service/WeightDeviceDataService.java +++ b/src/main/java/cn/lihongjie/coal/weightDeviceData/service/WeightDeviceDataService.java @@ -350,12 +350,7 @@ where 二次过磅时间>='%s' and 二次过磅时间<='%s' }); Page page = repository.findAll( - and.or(new Specification() { - @Override - public Predicate toPredicate(Root root, CriteriaQuery query, CriteriaBuilder criteriaBuilder) { - return criteriaBuilder.isNull(root.get("ecgbTime")); - } - }), + and, PageRequest.of( query.getPageNo(), query.getPageSize(),