From bd6b08e65fe29994c6c6b5430639022f2a4f5e5c Mon Sep 17 00:00:00 2001
From: wenminjie <1036699586@qq.com>
Date: 星期二, 14 七月 2026 11:48:08 +0800
Subject: [PATCH] 修复了已知的BUG
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTrainLibraryServiceImpl.java | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTrainLibraryServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTrainLibraryServiceImpl.java
index 2ea7409..053bdbd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTrainLibraryServiceImpl.java
+++ b/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;
}
--
Gitblit v1.7.1