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 18:49:10 +08:00 committed by Craftsman
parent 136fb39a47
commit 2102c34623
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -404,8 +404,10 @@ public class DashboardService {
if (CollectionUtils.isEmpty(allPermissionProjects)) { if (CollectionUtils.isEmpty(allPermissionProjects)) {
return new ArrayList<>(); return new ArrayList<>();
} }
List<ProjectUserMemberDTO> orgProjectMemberList = extProjectMemberMapper.getOrgProjectMemberList(organizationId, null);
if (CollectionUtils.isEmpty(userLayouts)) { if (CollectionUtils.isEmpty(userLayouts)) {
return getDefaultLayoutDTOS(allPermissionProjects.getFirst().getId()); List<String> userIds = orgProjectMemberList.stream().map(ProjectUserMemberDTO::getId).distinct().toList();
return getDefaultLayoutDTOS(allPermissionProjects.getFirst().getId(),userIds);
} }
UserLayout userLayout = userLayouts.getFirst(); UserLayout userLayout = userLayouts.getFirst();
byte[] configuration = userLayout.getConfiguration(); byte[] configuration = userLayout.getConfiguration();
@ -415,7 +417,6 @@ public class DashboardService {
} }
List<LayoutDTO> layoutDTOS = JSON.parseArray(layoutDTOStr, LayoutDTO.class); List<LayoutDTO> layoutDTOS = JSON.parseArray(layoutDTOStr, LayoutDTO.class);
Map<String, Set<String>> permissionModuleProjectIdMap = dashboardProjectService.getPermissionModuleProjectIds(allPermissionProjects, userId); Map<String, Set<String>> permissionModuleProjectIdMap = dashboardProjectService.getPermissionModuleProjectIds(allPermissionProjects, userId);
List<ProjectUserMemberDTO> orgProjectMemberList = extProjectMemberMapper.getOrgProjectMemberList(organizationId, null);
rebuildLayouts(layoutDTOS, allPermissionProjects, orgProjectMemberList, permissionModuleProjectIdMap); rebuildLayouts(layoutDTOS, allPermissionProjects, orgProjectMemberList, permissionModuleProjectIdMap);
return layoutDTOS.stream().sorted(Comparator.comparing(LayoutDTO::getPos)).collect(Collectors.toList()); return layoutDTOS.stream().sorted(Comparator.comparing(LayoutDTO::getPos)).collect(Collectors.toList());
} }
@ -477,6 +478,10 @@ public class DashboardService {
|| StringUtils.equalsIgnoreCase(layoutDTO.getKey(), DashboardUserLayoutKeys.BUG_HANDLE_USER.toString())) { || StringUtils.equalsIgnoreCase(layoutDTO.getKey(), DashboardUserLayoutKeys.BUG_HANDLE_USER.toString())) {
Set<String> hasReadProjectIds = permissionModuleProjectIdMap.get(PermissionConstants.PROJECT_BUG_READ); Set<String> hasReadProjectIds = permissionModuleProjectIdMap.get(PermissionConstants.PROJECT_BUG_READ);
checkHasPermissionProject(layoutDTO, hasReadProjectIds); checkHasPermissionProject(layoutDTO, hasReadProjectIds);
if (StringUtils.equalsIgnoreCase(layoutDTO.getKey(), DashboardUserLayoutKeys.BUG_HANDLE_USER.toString())) {
List<ProjectUserMemberDTO> list = orgProjectMemberList.stream().filter(t -> layoutDTO.getHandleUsers().contains(t.getId())).toList();
layoutDTO.setHandleUsers(list.stream().map(ProjectUserMemberDTO::getId).distinct().toList());
}
} }
} }
} }
@ -496,16 +501,16 @@ public class DashboardService {
/** /**
* 获取默认布局 * 获取默认布局
* *
* @param organizationId 组织ID * @param projectId 项目ID
* @return List<LayoutDTO> * @return List<LayoutDTO>
*/ */
private static List<LayoutDTO> getDefaultLayoutDTOS(String organizationId) { private static List<LayoutDTO> getDefaultLayoutDTOS(String projectId, List<String> userIds) {
List<LayoutDTO> layoutDTOS = new ArrayList<>(); List<LayoutDTO> layoutDTOS = new ArrayList<>();
LayoutDTO projectLayoutDTO = buildDefaultLayoutDTO(DashboardUserLayoutKeys.PROJECT_VIEW, "workbench.homePage.projectOverview", 0, new ArrayList<>()); LayoutDTO projectLayoutDTO = buildDefaultLayoutDTO(DashboardUserLayoutKeys.PROJECT_VIEW, "workbench.homePage.projectOverview", 0, new ArrayList<>(), new ArrayList<>());
layoutDTOS.add(projectLayoutDTO); layoutDTOS.add(projectLayoutDTO);
LayoutDTO createByMeLayoutDTO = buildDefaultLayoutDTO(DashboardUserLayoutKeys.CREATE_BY_ME, "workbench.homePage.createdByMe", 1, new ArrayList<>()); LayoutDTO createByMeLayoutDTO = buildDefaultLayoutDTO(DashboardUserLayoutKeys.CREATE_BY_ME, "workbench.homePage.createdByMe", 1, new ArrayList<>(), new ArrayList<>());
layoutDTOS.add(createByMeLayoutDTO); layoutDTOS.add(createByMeLayoutDTO);
LayoutDTO projectMemberLayoutDTO = buildDefaultLayoutDTO(DashboardUserLayoutKeys.PROJECT_MEMBER_VIEW, "workbench.homePage.staffOverview", 2, List.of(organizationId)); LayoutDTO projectMemberLayoutDTO = buildDefaultLayoutDTO(DashboardUserLayoutKeys.PROJECT_MEMBER_VIEW, "workbench.homePage.staffOverview", 2, List.of(projectId), userIds);
layoutDTOS.add(projectMemberLayoutDTO); layoutDTOS.add(projectMemberLayoutDTO);
return layoutDTOS; return layoutDTOS;
} }
@ -519,7 +524,7 @@ public class DashboardService {
* @param projectIds 布局卡片所选的项目ids * @param projectIds 布局卡片所选的项目ids
* @return LayoutDTO * @return LayoutDTO
*/ */
private static LayoutDTO buildDefaultLayoutDTO(DashboardUserLayoutKeys layoutKey, String label, int pos, List<String> projectIds) { private static LayoutDTO buildDefaultLayoutDTO(DashboardUserLayoutKeys layoutKey, String label, int pos, List<String> projectIds, List<String> users) {
LayoutDTO layoutDTO = new LayoutDTO(); LayoutDTO layoutDTO = new LayoutDTO();
layoutDTO.setId(UUID.randomUUID().toString()); layoutDTO.setId(UUID.randomUUID().toString());
layoutDTO.setKey(layoutKey.toString()); layoutDTO.setKey(layoutKey.toString());
@ -528,7 +533,7 @@ public class DashboardService {
layoutDTO.setSelectAll(true); layoutDTO.setSelectAll(true);
layoutDTO.setFullScreen(true); layoutDTO.setFullScreen(true);
layoutDTO.setProjectIds(projectIds); layoutDTO.setProjectIds(projectIds);
layoutDTO.setHandleUsers(new ArrayList<>()); layoutDTO.setHandleUsers(users);
return layoutDTO; return layoutDTO;
} }

1
backend/services/dashboard/src/test/java/io/metersphere/dashboard/controller/DashboardFrontPageControllerTests.java
View File

@ -115,6 +115,7 @@ public class DashboardFrontPageControllerTests extends BaseTest {
dashboardFrontPageRequest.setCurrent(1); dashboardFrontPageRequest.setCurrent(1);
dashboardFrontPageRequest.setPageSize(5); dashboardFrontPageRequest.setPageSize(5);
dashboardFrontPageRequest.setProjectIds(List.of(DEFAULT_PROJECT_ID)); dashboardFrontPageRequest.setProjectIds(List.of(DEFAULT_PROJECT_ID));
dashboardFrontPageRequest.setHandleUsers(List.of("admin"));
MvcResult bugMvcResult = this.requestPostWithOkAndReturn(BUG_HANDLE_USER, dashboardFrontPageRequest); MvcResult bugMvcResult = this.requestPostWithOkAndReturn(BUG_HANDLE_USER, dashboardFrontPageRequest);
String bugContentAsString = bugMvcResult.getResponse().getContentAsString(StandardCharsets.UTF_8); String bugContentAsString = bugMvcResult.getResponse().getContentAsString(StandardCharsets.UTF_8);
ResultHolder bugResultHolder = JSON.parseObject(bugContentAsString, ResultHolder.class); ResultHolder bugResultHolder = JSON.parseObject(bugContentAsString, ResultHolder.class);