From 6f0797731657022e9812b92fb4d78bcf56a65c1d Mon Sep 17 00:00:00 2001
From: fei <791364011@qq.com>
Date: 星期一, 05 一月 2026 00:00:16 +0800
Subject: [PATCH] 修改了对应代码
---
archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
index a483197..089753a 100644
--- a/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
+++ b/archiveManager/src/main/java/com/ruoyi/service/impl/DocumentMaterialsServiceImpl.java
@@ -73,7 +73,7 @@
public AjaxResult selectDataList(DocumentMaterials documentMaterials, Integer pageNum, Integer pageSize) {
LambdaQueryWrapper<DocumentMaterials> lqw = buildCondition(documentMaterials);
-
+ lqw.eq(true, DocumentMaterials::getVisible, 1);
Page<DocumentMaterials> zfClanPage = new Page<>(pageNum, pageSize);
Page<DocumentMaterials> pageResult = page(zfClanPage, lqw);
@@ -113,6 +113,23 @@
public List<DocumentMaterials> selectDocumentMaterialsList(DocumentMaterials documentMaterials) {
LambdaQueryWrapper<DocumentMaterials> lambdaQueryWrapper = buildCondition(documentMaterials);
List<DocumentMaterials> beanRecords = list(lambdaQueryWrapper);
+ int size = beanRecords.size();
+ // 鑾峰彇璇ユ鍗风殑鏈�澶ч〉鍙凤紙鎬婚〉鏁帮級
+ Long totalPages = this.baseMapper.getMaxPageNumber(documentMaterials.getRecordId().intValue());
+
+ // 閬嶅巻鎵�鏈夋潯鐩紝璁剧疆pageNumberFormatted
+ for (int i = 0; i < size; i++) {
+ DocumentMaterials item = beanRecords.get(i);
+ Long pageNumber = item.getPageNumber();
+
+ if (i == size - 1) {
+ // 鏈�鍚庝竴琛岋細鏍煎紡鍖栭〉鍙蜂负"鏈�鍚庝竴椤甸〉鍙�-鎬婚〉鏁�"鐨勫舰寮�
+ item.setPageNumberFormatted(pageNumber + "-" + totalPages);
+ } else {
+ // 鍏朵粬琛岋細鐩存帴浣跨敤pageNumber鐨勫��
+ item.setPageNumberFormatted(pageNumber != null ? pageNumber.toString() : "");
+ }
+ }
return beanRecords;
}
@@ -456,6 +473,8 @@
newRecord.setFileSize(null);
newRecord.setFormat(null);
newRecord.setUrl(null);
+ newRecord.setVisible(0);
+
// 娣诲姞鍒颁腑闂磋褰曞垪琛�
middleRecords.add(newRecord);
}
--
Gitblit v1.9.1