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 impl } } Map finalMap = map; + AtomicInteger i = new AtomicInteger(); IPage convert = page.convert((Function) library -> { QueryLibraryPageVO libraryPageVO = CopyUtil.copyObject(library, QueryLibraryPageVO.class); libraryPageVO.setDesignType(DesignTypeEnum.LIBRARY.getRealName()); @@ -228,9 +230,25 @@ public class LibraryServiceImpl extends ServiceImpl impl } return libraryPageVO; }else { + i.getAndIncrement(); return null; } - }); + }).getRecords().stream() + .filter(Objects::nonNull) + .collect(Collectors.collectingAndThen( + Collectors.toList(), + list -> new Page(page.getCurrent(), page.getSize(), page.getTotal()) { + @Override + public List getRecords() { + return list; + } + + @Override + public long getTotal() { + return list.size(); + } + } + )); return PageBaseResponse.success(convert); }