From 98155fd1e80b43796363a9cf665085c2f92dd23f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期一, 27 十月 2025 18:06:41 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java
index f5461df..f9352aa 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysProductIntroductionServiceImpl.java
@@ -17,6 +17,7 @@
import java.util.List;
import java.util.Objects;
import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -35,7 +36,7 @@
@Override
public PageInfo<TSysProductIntroductionVO> pageList(TSysProductIntroductionQuery query) {
PageInfo<TSysProductIntroductionVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
- List<TSysProductIntroductionVO> list = this.baseMapper.pageList(query,pageInfo);
+ List<TSysProductIntroductionVO> list = this.baseMapper.pageList(query);
if (CollectionUtils.isEmpty(list)){
return pageInfo;
}
@@ -48,6 +49,27 @@
}
}
}
+
+ int index = (query.getPageNum() - 1) * query.getPageSize();
+ pageInfo.setTotal(list.size());
+
+ // 排序是否已读，未读的排前面,false排前面 true排后面
+ list.stream().sorted((o1, o2) -> {
+ if(o1.getIsView()){
+ return 1;
+ }
+ return -1;
+ }).collect(Collectors.toList());
+
+ if (pageInfo.getTotal() > index) {
+ //此时存在数据
+ if (pageInfo.getTotal() > index + query.getPageSize()) {
+ list = list.subList(index, index + query.getPageSize());
+ } else {
+ list = list.subList(index, list.size());
+ }
+ }
+
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1