From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 六月 2025 18:07:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java | 9 ++++++++-
1 files changed, 8 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..e35b2ba 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
@@ -40,7 +40,7 @@
*/
@Api(tags = "实验员其他任务管理")
@RestController
-@RequestMapping("/t-tester-other-task")
+@RequestMapping("")
public class TTesterOtherTaskController {
private final TTesterOtherTaskService testerOtherTaskService;
@@ -144,6 +144,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