From 6bf77f70ff3396fc1b7050c9454225523f506b1f Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 01 七月 2025 09:20:08 +0800
Subject: [PATCH] bug修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java | 38 ++++++++++++++++++++++++++++++++++++++
1 files changed, 38 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java
index 6c4e043..59466e8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTesterWorkEvaluateServiceImpl.java
@@ -41,6 +41,9 @@
@Override
public PageInfo<TResultWorkEvaluateVO> pageList(TResultWorkEvaluateQuery query) {
PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if(CollectionUtils.isEmpty(query.getTeamIds())){
+ return pageInfo;
+ }
List<TResultWorkEvaluateVO> list = this.baseMapper.pageList(query,pageInfo);
List<TResultWorkEvaluate> tResultWorkEvaluates = this.baseMapper.selectList(new LambdaQueryWrapper<TResultWorkEvaluate>()
.orderByDesc(TResultWorkEvaluate::getEvaluateTime)
@@ -228,14 +231,49 @@
@Override
public PageInfo<TResultWorkEvaluateVO> chemistEvaluateList(TResultWorkEvaluateQuery query) {
PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if(CollectionUtils.isEmpty(query.getTeamIds())){
+ return pageInfo;
+ }
List<TResultWorkEvaluateVO> list = this.baseMapper.chemistEvaluateList(query,pageInfo);
+ if(CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+
+ List<Long> userIds = list.stream().map(TResultWorkEvaluateVO::getUserId).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(userIds)){
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ list.forEach(tResultWorkEvaluateVO -> {
+ SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tResultWorkEvaluateVO.getUserId())).findFirst().orElse(null);
+ if(sysUser != null){
+ tResultWorkEvaluateVO.setChemistName(sysUser.getNickName());
+ }
+ });
+ }
pageInfo.setRecords(list);
return pageInfo;
}
@Override
public PageInfo<TResultWorkEvaluateVO> testerEvaluateList(TResultWorkEvaluateQuery query) {
PageInfo<TResultWorkEvaluateVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ if(CollectionUtils.isEmpty(query.getTeamIds())){
+ return pageInfo;
+ }
List<TResultWorkEvaluateVO> list = this.baseMapper.testerEvaluateList(query,pageInfo);
+ if(CollectionUtils.isEmpty(list)){
+ return pageInfo;
+ }
+
+ List<Long> userIds = list.stream().map(TResultWorkEvaluateVO::getUserId).collect(Collectors.toList());
+ if(!CollectionUtils.isEmpty(userIds)){
+ List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
+ list.forEach(tResultWorkEvaluateVO -> {
+ SysUser sysUser = sysUsers.stream().filter(user -> user.getUserId().equals(tResultWorkEvaluateVO.getUserId())).findFirst().orElse(null);
+ if(sysUser != null){
+ tResultWorkEvaluateVO.setTesterName(sysUser.getNickName());
+ }
+ });
+ }
+
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1