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:
WangXu10 2024-02-04 16:18:50 +08:00 committed by 刘瑞斌
parent 13bc39a45c
commit d129681f4f
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/services/project-management/src/main/java/io/metersphere/project/service/ProjectUserRoleService.java
View File

@ -26,6 +26,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@ -71,6 +72,7 @@ public class ProjectUserRoleService extends BaseUserRoleService {
role.setMemberCount(0);
});
}
roles.sort(Comparator.comparing(UserRole::getInternal).reversed());
return roles;
}

6
backend/services/system-setting/src/main/java/io/metersphere/system/service/GlobalUserRoleService.java
View File

@ -15,6 +15,7 @@ import jakarta.annotation.Resource;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -45,10 +46,15 @@ public class GlobalUserRoleService extends BaseUserRoleService {
List<UserRole> userRoles = userRoleMapper.selectByExample(example);
// 先按照类型排序，再按照创建时间排序
userRoles.sort(Comparator.comparingInt(this::getTypeOrder)
.thenComparingInt(item ->getInternal(item.getInternal()))
.thenComparing(UserRole::getCreateTime));
return userRoles;
}
private int getInternal(Boolean internal) {
return BooleanUtils.isTrue(internal) ? 0 : 1;
}
private int getTypeOrder(UserRole userRole) {
Map<String, Integer> typeOrderMap = new HashMap<>(3) {{
put(UserRoleType.SYSTEM.name(), 1);

5
backend/services/system-setting/src/main/java/io/metersphere/system/service/OrganizationUserRoleService.java
View File

@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
import static io.metersphere.system.controller.result.SystemResultCode.NO_ORG_USER_ROLE_PERMISSION;
@ -46,7 +47,9 @@ public class OrganizationUserRoleService extends BaseUserRoleService {
example.createCriteria().andTypeEqualTo(UserRoleType.ORGANIZATION.name())
.andScopeIdIn(Arrays.asList(organizationId, UserRoleEnum.GLOBAL.toString()));
example.setOrderByClause("create_time asc");
return userRoleMapper.selectByExample(example);
List<UserRole> userRoles = userRoleMapper.selectByExample(example);
userRoles.sort(Comparator.comparing(UserRole::getInternal).reversed());
return userRoles;
}
@Override