修复了已知的BUG

wenminjie

2026-07-14 bd6b08e65fe29994c6c6b5430639022f2a4f5e5c

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

@@ -2,20 +2,22 @@

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.system.mapper.TTrainLibraryMapper;
import com.ruoyi.system.model.TProjectTeam;
import com.ruoyi.system.model.TTrainLibrary;
import com.ruoyi.system.model.TTrainLibraryWarehousing;
import com.ruoyi.system.query.TTrainLibraryDetailQuery;
import com.ruoyi.system.query.TTrainLibraryQuery;
import com.ruoyi.system.service.TProjectTeamService;
import com.ruoyi.system.service.TTrainLibraryService;
import com.ruoyi.system.vo.TProjectTeamVO;
import com.ruoyi.system.vo.TTrainLibraryDetailVO;
import com.ruoyi.system.vo.TTrainLibraryVO;
import com.ruoyi.system.vo.TTrainLibraryWarehousingVO;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
@@ -28,12 +30,29 @@
 */
@Service
public class TTrainLibraryServiceImpl extends ServiceImpl<TTrainLibraryMapper, TTrainLibrary> implements TTrainLibraryService {
    @Resource
    private TProjectTeamService projectTeamService;

    @Override
    public PageInfo<TTrainLibraryVO> pageList(TTrainLibraryQuery query) {
    public PageInfo<TTrainLibraryVO> pageList(TTrainLibraryQuery query, String roleType) {
        PageInfo<TTrainLibraryVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TTrainLibraryVO> list = this.baseMapper.pageList(query,pageInfo);
        pageInfo.setRecords(list);

        List<TTrainLibraryVO> resultList = new ArrayList<>();

        for (TTrainLibraryVO tTrainLibraryVO : list) {
            if (StringUtils.isNotEmpty(tTrainLibraryVO.getProjectId())) {
                TProjectTeam byId = projectTeamService.getById(tTrainLibraryVO.getProjectId());
                //未封存的数据
                if (byId != null && ("2".equals(roleType) || byId.getStatus() == 1)) {  // 只处理status为1的数据
                    tTrainLibraryVO.setProjectName(byId.getTeamName());
                    resultList.add(tTrainLibraryVO);
                }
            }
        }

        pageInfo.setRecords(resultList);
        pageInfo.setTotal(resultList.size());  // 重新设置总记录数
        return pageInfo;
    }