From 30521c18a4c09ca3ff03b8216a243adc745ccf3c Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 04 三月 2026 19:05:34 +0800
Subject: [PATCH] 超级管理员权限修改，工作评定统计
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TTesterOtherTaskController.java | 10 +++++++++-
1 files changed, 9 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..73288d2 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;
@@ -67,6 +67,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)
@@ -144,6 +145,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