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

refactor(系统设置): 补充组织列表进入项目标识

This commit is contained in:
song-cc-rock 2024-08-14 15:00:30 +08:00 committed by 刘瑞斌
parent 3128e80916
commit d2be7d6be7
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/system-setting/src/main/java/io/metersphere/system/controller/SystemOrganizationController.java
View File

@ -55,7 +55,7 @@ public class SystemOrganizationController {
public Pager<List<OrganizationDTO>> list(@Validated @RequestBody OrganizationRequest request) {
Page<Object> page = PageHelper.startPage(request.getCurrent(), request.getPageSize(),
StringUtils.isNotBlank(request.getSortString()) ? request.getSortString() : "create_time desc");
return PageUtils.setPageInfo(page, organizationService.list(request));
return PageUtils.setPageInfo(page, organizationService.list(request, SessionUtils.getUserId()));
}
@PostMapping("/update")

6
backend/services/system-setting/src/main/java/io/metersphere/system/dto/OrganizationDTO.java
View File

@ -55,4 +55,10 @@ public class OrganizationDTO extends Organization {
*/
@Schema(description = "剩余删除保留天数")
private Integer remainDayCount;
/**
* 是否可以进入组织
*/
@Schema(description = "是否切换并进入")
private Boolean switchAndEnter;
}

10
backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationService.java
View File

@ -88,13 +88,13 @@ public class OrganizationService {
* @param organizationRequest 请求参数
* @return 组织集合
*/
public List<OrganizationDTO> list(OrganizationRequest organizationRequest) {
public List<OrganizationDTO> list(OrganizationRequest organizationRequest, String currentUser) {
List<OrganizationDTO> organizationDTOS = extOrganizationMapper.list(organizationRequest);
if (CollectionUtils.isEmpty(organizationDTOS)) {
return new ArrayList<>();
}
List<OrganizationDTO> organizations = buildOrgAdminInfo(organizationDTOS);
return buildExtraInfo(organizations);
return buildExtraInfo(organizations, currentUser);
}
/**
@ -963,7 +963,7 @@ public class OrganizationService {
* @param organizationDTOS 组织集合
* @return 组织集合
*/
private List<OrganizationDTO> buildExtraInfo(List<OrganizationDTO> organizationDTOS) {
private List<OrganizationDTO> buildExtraInfo(List<OrganizationDTO> organizationDTOS, String currentUser) {
List<String> userIds = new ArrayList<>();
userIds.addAll(organizationDTOS.stream().map(OrganizationDTO::getCreateUser).toList());
userIds.addAll(organizationDTOS.stream().map(OrganizationDTO::getUpdateUser).toList());
@ -971,6 +971,9 @@ public class OrganizationService {
Map<String, String> userMap = userLoginService.getUserNameMap(userIds.stream().distinct().toList());
List<String> ids = organizationDTOS.stream().map(OrganizationDTO::getId).toList();
List<OrganizationCountDTO> orgCountList = extOrganizationMapper.getCountByIds(ids);
// 是否拥有组织
boolean isSuper = baseUserMapper.isSuperUser(currentUser);
List<String> relatedOrganizationIds = extOrganizationMapper.getRelatedOrganizationIds(currentUser);
Map<String, OrganizationCountDTO> orgCountMap = orgCountList.stream().collect(Collectors.toMap(OrganizationCountDTO::getId, count -> count));
organizationDTOS.forEach(organizationDTO -> {
organizationDTO.setCreateUser(userMap.get(organizationDTO.getCreateUser()));
@ -981,6 +984,7 @@ public class OrganizationService {
if (BooleanUtils.isTrue(organizationDTO.getDeleted())) {
organizationDTO.setRemainDayCount(getDeleteRemainDays(organizationDTO.getDeleteTime()));
}
organizationDTO.setSwitchAndEnter(isSuper || relatedOrganizationIds.contains(organizationDTO.getId()));
});
return organizationDTOS;
}