修复了已知的BUG

wenminjie

2026-07-14 bd6b08e65fe29994c6c6b5430639022f2a4f5e5c

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

@@ -3,14 +3,19 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.mapper.TBreedingAndPreservationMapper;
import com.ruoyi.system.mapper.TProjectTeamMapper;
import com.ruoyi.system.mapper.TProjectTeamStaffMapper;
import com.ruoyi.system.model.TBreedingAndPreservation;
import com.ruoyi.system.model.TProjectTeam;
import com.ruoyi.system.model.TProjectTeamStaff;
import com.ruoyi.system.query.TBreedingAndPreservationQuery;
import com.ruoyi.system.service.TBreedingAndPreservationService;
import com.ruoyi.system.vo.TBreedingAndPreservationVO;
import com.ruoyi.system.vo.TPedigreeChartVO;
import com.ruoyi.system.vo.TProjectTeamVO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;

@@ -27,11 +32,21 @@
 */
@Service
public class TBreedingAndPreservationServiceImpl extends ServiceImpl<TBreedingAndPreservationMapper, TBreedingAndPreservation> implements TBreedingAndPreservationService {
    @Autowired
    private TProjectTeamMapper projectTeamMapper;

    @Override
    public PageInfo<TBreedingAndPreservationVO> pageList(TBreedingAndPreservationQuery query) {
        PageInfo<TBreedingAndPreservationVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TBreedingAndPreservationVO> list = this.baseMapper.pageList(query,pageInfo);
        for (TBreedingAndPreservationVO tBreedingAndPreservationVO : list) {
            if (StringUtils.isNotEmpty(tBreedingAndPreservationVO.getProjectId())) {
                TProjectTeam tProjectTeam = projectTeamMapper.selectById(tBreedingAndPreservationVO.getProjectId());
                if (tProjectTeam != null) {
                    tBreedingAndPreservationVO.setProjectName(tProjectTeam.getTeamName());
                }
            }
        }
        pageInfo.setRecords(list);
        return pageInfo;
    }