bug修改

xuhy

2025-10-27 98155fd1e80b43796363a9cf665085c2f92dd23f

bug修改

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysActivityMapper.java

@@ -23,10 +23,9 @@
     * 分页查询
     *
     * @param query
     * @param pageInfo
     * @return
     */
    List<TSysActivityVO> pageList(@Param("query") TSysActivityQuery query, @Param("pageInfo")PageInfo<TSysActivityVO> pageInfo);
    List<TSysActivityVO> pageList(@Param("query") TSysActivityQuery query);
    /**
     * 分页查询
     *

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysEducationalInfoMapper.java

@@ -22,10 +22,9 @@
    /**
     * 获取教育资讯分页列表
     * @param query
     * @param pageInfo
     * @return
     */
    List<TSysEducationalInfoVO> pageList(@Param("query") TSysEducationalInfoQuery query, @Param("pageInfo")PageInfo<TSysEducationalInfoVO> pageInfo);
    List<TSysEducationalInfoVO> pageList(@Param("query") TSysEducationalInfoQuery query);
    /**
     * 获取教育资讯分页列表
     * @param query

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysLiveMapper.java

@@ -25,7 +25,7 @@
     * @param query 查询参数
     * @return 直播管理列表
     */
    List<TSysLiveVO> pageList(@Param("query") TSysLiveQuery query, @Param("pageInfo")PageInfo<TSysLiveVO> pageInfo);
    List<TSysLiveVO> pageList(@Param("query") TSysLiveQuery query);
    /**
     * 获取直播管理分页列表
     *

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TSysProductIntroductionMapper.java

@@ -23,10 +23,9 @@
     * 分页查询
     *
     * @param query
     * @param pageInfo
     * @return
     */
    List<TSysProductIntroductionVO> pageList(@Param("query") TSysProductIntroductionQuery query, @Param("pageInfo")PageInfo<TSysProductIntroductionVO> pageInfo);
    List<TSysProductIntroductionVO> pageList(@Param("query") TSysProductIntroductionQuery query);
    /**
     * 分页查询
     *

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysActivityServiceImpl.java

@@ -15,9 +15,14 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;

/**
 * <p>
@@ -34,7 +39,7 @@
    @Override
    public PageInfo<TSysActivityVO> pageList(TSysActivityQuery query) {
        PageInfo<TSysActivityVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TSysActivityVO> list = this.baseMapper.pageList(query,pageInfo);
        List<TSysActivityVO> list = this.baseMapper.pageList(query);
        if (CollectionUtils.isEmpty(list)){
            return pageInfo;
        }
@@ -47,6 +52,26 @@
                }
            }
        }

        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;
    }

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysEducationalInfoServiceImpl.java

@@ -18,6 +18,7 @@
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;

/**
 * <p>
@@ -34,7 +35,7 @@
    @Override
    public PageInfo<TSysEducationalInfoVO> pageList(TSysEducationalInfoQuery query) {
        PageInfo<TSysEducationalInfoVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TSysEducationalInfoVO> list = this.baseMapper.pageList(query,pageInfo);
        List<TSysEducationalInfoVO> list = this.baseMapper.pageList(query);
        if (CollectionUtils.isEmpty(list)){
            return pageInfo;
        }
@@ -47,6 +48,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;
    }

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TSysLiveServiceImpl.java

@@ -27,6 +27,7 @@

import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

/**
 * <p>
@@ -62,7 +63,7 @@
    @Override
    public PageInfo<TSysLiveVO> pageList(TSysLiveQuery query) {
        PageInfo<TSysLiveVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TSysLiveVO> list = this.baseMapper.pageList(query,pageInfo);
        List<TSysLiveVO> list = this.baseMapper.pageList(query);
        if (CollectionUtils.isEmpty(list)){
            return pageInfo;
        }
@@ -88,8 +89,28 @@
                    sysLive.setIsView(true);
                }
            }

        }

        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;
    }

 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;
    }