From 0220811fbcffd4bd4df334502a2af272ae29f1e3 Mon Sep 17 00:00:00 2001
From: wenminjie <1036699586@qq.com>
Date: 星期一, 13 七月 2026 10:14:30 +0800
Subject: [PATCH] 修复了已知BUG
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java
index b46cbc9..44538c1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java
@@ -8,6 +8,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.TTesterOtherTaskDTO;
import com.ruoyi.system.mapper.SysUserMapper;
@@ -40,7 +41,7 @@
*/
@Api(tags = "实验员其他任务管理")
@RestController
-@RequestMapping("/t-tester-other-task")
+@RequestMapping("")
public class TTesterOtherTaskController {
private final TTesterOtherTaskService testerOtherTaskService;
@@ -67,6 +68,7 @@
TTesterOtherTaskQuery query = JSON.parseObject(param, TTesterOtherTaskQuery.class);
Long userId = tokenService.getLoginUser().getUserId();
Integer roleType = tokenService.getLoginUser().getUser().getRoleType();
+ query.setRoleType(roleType);
if(roleType != 1){
// 查询用户所在项目组
List<TProjectTeamStaff> projectTeamStaffs = projectTeamStaffService.list(Wrappers.lambdaQuery(TProjectTeamStaff.class)
@@ -134,6 +136,11 @@
BeanUtils.copyProperties(testerOtherTask, testerOtherTaskVO);
// 查询项目组信息
TProjectTeam projectTeam = projectTeamService.getById(testerOtherTask.getTeamId());
+
+ if (projectTeam == null) {
+ throw new ServiceException("当前实验任务的项目组不存在");
+ }
+
TProjectTeamVO projectTeamVO = new TProjectTeamVO();
BeanUtils.copyProperties(projectTeam, projectTeamVO);
// 查询项目组成员
@@ -144,6 +151,13 @@
List<SysUser> sysUsers = sysUserMapper.selectUserByIds(userIds);
// 拼接项目组成员名称
projectTeamVO.setStaffName(sysUsers.stream().map(SysUser::getNickName).collect(Collectors.joining(",")));
+ projectTeamStaffs.stream().forEach(projectTeamStaff -> {
+ SysUser user = sysUsers.stream().filter(sysUser -> sysUser.getUserId().equals(projectTeamStaff.getUserId())).findFirst().orElse(null);
+ if(Objects.nonNull(user)){
+ projectTeamStaff.setNickName(user.getNickName());
+ }
+ });
+ projectTeamVO.setStaffs(projectTeamStaffs);
testerOtherTaskVO.setProjectTeam(projectTeamVO);
// 查询是演员信息
SysUser sysUser = sysUserMapper.selectUserById(testerOtherTaskVO.getTesterId());
--
Gitblit v1.7.1