From 6515091ac501b545d61a78137b951173569799b1 Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Sat, 12 Oct 2024 09:44:55 +0800
Subject: [PATCH] bugfix

---
 .../weightDeviceData/service/WeightDeviceDataService.java  | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

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<WeightDeviceDataEntity> 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(),