test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(工作台): 人员为空不是默认全部

This commit is contained in:
guoyuqi 2024-11-27 10:58:08 +08:00 committed by 刘瑞斌
parent 93a013a315
commit 5f1f058f1e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/services/dashboard/src/main/java/io/metersphere/dashboard/service/DashboardService.java
View File

@ -540,6 +540,9 @@ public class DashboardService {
Long toEndTime = request.getToEndTime();
List<ProjectUserMemberDTO> projectMemberList = extProjectMemberMapper.getProjectMemberList(projectId, request.getHandleUsers());
Map<String, String> userNameMap = projectMemberList.stream().collect(Collectors.toMap(ProjectUserMemberDTO::getId, ProjectUserMemberDTO::getName));
if (CollectionUtils.isEmpty(request.getHandleUsers())) {
return new OverViewCountDTO(new HashMap<>(), new ArrayList<>(), new ArrayList<>(), 0);
}
return getUserCountDTO(userNameMap, moduleIds, projectId, toStartTime, toEndTime);
}
@ -803,6 +806,9 @@ public class DashboardService {
Long toEndTime = request.getToEndTime();
List<SelectOption> headerHandlerOption = getHandlerOption(request.getHandleUsers(), projectId);
//获取每个人每个状态有多少数据(已按照用户id排序)
if (CollectionUtils.isEmpty(request.getHandleUsers())) {
return new OverViewCountDTO(new HashMap<>(), new ArrayList<>(), new ArrayList<>(), 0);
}
String platformName = projectApplicationService.getPlatformName(projectId);
List<SelectOption> headerStatusOption = getStatusOption(projectId, platformName);
Set<String> platforms = getPlatforms(platformName);