From 263b034b4058bb7a36c709278abdc88ca1ba26c1 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 30 三月 2026 18:01:25 +0800
Subject: [PATCH] feat: 生产成本导入数据入库

---
 src/main/java/com/ruoyi/production/service/impl/ProductionCostServiceImpl.java |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionCostServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionCostServiceImpl.java
index 25a32aa..152173d 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionCostServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionCostServiceImpl.java
@@ -179,12 +179,24 @@
 
     private <T> IPage<T> getMemoryPage(Page<T> page, List<T> list) {
         int total = list.size();
-        int size = (int) page.getSize();
-        int current = (int) page.getCurrent();
-        int fromIndex = (current - 1) * size;
-        int toIndex = Math.min(fromIndex + size, total);
+        long size = page.getSize();
+        long current = page.getCurrent();
 
-        List<T> subList = (fromIndex < total && fromIndex >= 0) ? list.subList(fromIndex, toIndex) : new ArrayList<>();
+        if (size == -1 || current == -1) {
+            page.setTotal(total);
+            page.setRecords(list);
+            return page;
+        }
+
+        int fromIndex = (int) ((current - 1) * size);
+        int toIndex = Math.min(fromIndex + (int) size, total);
+
+        List<T> subList;
+        if (fromIndex >= 0 && fromIndex < total) {
+            subList = list.subList(fromIndex, toIndex);
+        } else {
+            subList = new ArrayList<>();
+        }
 
         page.setTotal(total);
         page.setRecords(subList);

--
Gitblit v1.9.3