diff --git a/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java b/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java index 3f29d53..0c4597f 100644 --- a/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java +++ b/src/main/java/com/zcloud/service/depository/impl/TextLibraryServiceImpl.java @@ -92,17 +92,6 @@ public class TextLibraryServiceImpl implements TextLibraryService { */ public List list(Page page) throws Exception { List list = textlibraryMapper.datalistPage(page); - list = list.stream().parallel().distinct().collect(Collectors.toList()); - page.setTotalResult(list.size()); - if (page.getTotalResult() % page.getShowCount() == 0) - page.setTotalPage(page.getTotalResult() / page.getShowCount()); - else - page.setTotalPage(page.getTotalResult() / page.getShowCount() + 1); - if (page.getCurrentPage() <= 0) - page.getPd().put("currentResult", (page.getCurrentPage()) * page.getShowCount()); - else - page.getPd().put("currentResult", (page.getCurrentPage() - 1) * page.getShowCount()); - for (PageData entity : list) { List _labels = libraryLabelsMapper.findBylibraryId(entity); // 安全操作规程 diff --git a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml index a392491..6905f4e 100644 --- a/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml +++ b/src/main/resources/mybatis/datasource/depository/TextLibraryMapper.xml @@ -137,8 +137,25 @@