From 45d410b2610a25a0b669b425969c9ce78d8c4817 Mon Sep 17 00:00:00 2001
From: huangfeng <huangfeng@xinyingpower.com>
Date: Mon, 22 Apr 2024 09:44:47 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20JPA=E9=A1=B5=E7=A0=81=E5=87=8F1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/xydl/cac/service/impl/NPointServiceImpl.java  | 2 +-
 src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java | 2 +-
 src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/xydl/cac/service/impl/NPointServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NPointServiceImpl.java
index 579f397..fdc26ab 100644
--- a/src/main/java/com/xydl/cac/service/impl/NPointServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NPointServiceImpl.java
@@ -35,7 +35,7 @@ public class NPointServiceImpl implements NPointService {
 
     @Override
     public Page<NPoint> list(int pageNum, int pageSize) {
-        PageRequest request = PageRequest.of(pageNum, pageSize);
+        PageRequest request = PageRequest.of(pageNum - 1, pageSize);
         Page<NPoint> result = repository.findAll(request);
         return result;
     }
diff --git a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
index 5f02472..883ce5a 100644
--- a/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/NSensorServiceImpl.java
@@ -92,7 +92,7 @@ public class NSensorServiceImpl implements NSensorService {
 
     @Override
     public Page<NSensor> list(Integer typeId, int pageNum, int pageSize) throws Exception {
-        PageRequest request = PageRequest.of(pageNum, pageSize);
+        PageRequest request = PageRequest.of(pageNum - 1, pageSize);
         Specification<NSensor> specification = (root, query, builder) -> {
             Predicate predicate = builder.conjunction();
             if (typeId != null) {
diff --git a/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java
index afc0e92..7a8e5a8 100644
--- a/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java
+++ b/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java
@@ -25,7 +25,7 @@ public class WarningServiceImpl implements WarningService {
 
     @Override
     public Page<Warning> list(ConditionModel condition) throws Exception {
-        PageRequest request = PageRequest.of(condition.getPageNum(), condition.getPageSize());
+        PageRequest request = PageRequest.of(condition.getPageNum() - 1, condition.getPageSize());
         Specification<Warning> specification = (root, query, builder) -> {
             Predicate predicate = builder.conjunction();
             if (condition.getDevId() != null) {