From 7839ac33228ee48606b2f4ef727561678d70e3de Mon Sep 17 00:00:00 2001
From: shahaibo <1023316923@qq.com>
Date: Wed, 12 Mar 2025 21:54:23 +0800
Subject: [PATCH] =?UTF-8?q?BUGFIX:=20=E9=9A=90=E8=97=8F=E5=8A=A0=E8=BD=BD?=
 =?UTF-8?q?=E4=B8=8D=E5=87=BAminio=E7=9A=84=E7=9B=B8=E5=85=B3=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../da/service/impl/LibraryServiceImpl.java   | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
index c5ce2b79..b57096d8 100644
--- a/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
+++ b/src/main/java/com/ai/da/service/impl/LibraryServiceImpl.java
@@ -51,6 +51,7 @@ import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 /**
@@ -202,6 +203,7 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
             }
         }
         Map<Long, LibraryModelPointVO> finalMap = map;
+        AtomicInteger i = new AtomicInteger();
         IPage<QueryLibraryPageVO> convert = page.convert((Function<Library, QueryLibraryPageVO>) library -> {
             QueryLibraryPageVO libraryPageVO = CopyUtil.copyObject(library, QueryLibraryPageVO.class);
             libraryPageVO.setDesignType(DesignTypeEnum.LIBRARY.getRealName());
@@ -228,9 +230,25 @@ public class LibraryServiceImpl extends ServiceImpl<LibraryMapper, Library> impl
                 }
                 return libraryPageVO;
             }else {
+                i.getAndIncrement();
                 return null;
             }
-        });
+        }).getRecords().stream()
+                .filter(Objects::nonNull)
+                .collect(Collectors.collectingAndThen(
+                        Collectors.toList(),
+                        list -> new Page<QueryLibraryPageVO>(page.getCurrent(), page.getSize(), page.getTotal()) {
+                            @Override
+                            public List<QueryLibraryPageVO> getRecords() {
+                                return list;
+                            }
+
+                            @Override
+                            public long getTotal() {
+                                return list.size();
+                            }
+                        }
+                ));
         return PageBaseResponse.success(convert);
     }