From 4cd045abad128f4f57611302f995154fd6ac1238 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Fri, 9 Sep 2022 10:24:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=A1=A3=E6=8B=86=E5=88=86-bug59381:?=
 =?UTF-8?q?=20=E8=A7=A3=E5=86=B3=E5=8A=A0=E8=BD=BD=E8=BF=87=E9=95=BF?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BussDocumentLibraryEOServiceImpl.java    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
index 17ef37b88..569e7bd31 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java
@@ -3550,7 +3550,20 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl<BussDocumentLi
 //        List records = infoPage.getRecords();
         List records = bussDocumentLibraryEOMapper.ocrPageInfo(field, conditionSb.toString());
         page.setTotal(records.size());
-        records = records.subList(pageNo * pageSize - pageSize, pageNo * pageSize);
+
+        int subSize = pageSize; // 每页记录数
+        int subCount = records.size(); // 总记录数
+        int subPageTotal = (subCount / subSize) + ((subCount % subSize > 0) ? 1 : 0); //总页数
+
+        // 分页计算
+        int fromIndex = (pageNo-1) * subSize;
+        int toIndex = ((pageNo == subPageTotal) ? subCount : (pageNo * subSize));
+        if( fromIndex <= subCount && toIndex <= subCount) {
+            records = records.subList(fromIndex, toIndex);
+        } else {
+            records = new ArrayList();
+        }
+
 
         //数据字典
         List<SysDictItem> sysDictItems = sysDictItemServiceImpl.selectItemsAll();