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

fix: 处理用户登录autoswitch

This commit is contained in:
Captain.B 2021-05-26 21:27:23 +08:00 committed by 刘瑞斌
parent d95db82cee
commit c262beb5a0
1 changed files with 51 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
backend/src/main/java/io/metersphere/service/UserService.java
View File

@ -808,53 +808,60 @@ public class UserService {
} }
private void autoSwitch(UserDTO user) { private void autoSwitch(UserDTO user) {
if (StringUtils.isEmpty(user.getLastProjectId())) { if (StringUtils.isNotBlank(user.getLastProjectId())) {
List<UserGroup> userGroups = user.getUserGroups(); List<UserGroup> projectUserGroups = user.getUserGroups().stream()
List<String> projectGroupIds = user.getGroups() .filter(ug -> StringUtils.equals(user.getLastProjectId(), ug.getSourceId()))
.stream().filter(ug -> StringUtils.equals(ug.getType(), UserGroupType.PROJECT))
.map(Group::getId)
.collect(Collectors.toList()); .collect(Collectors.toList());
List<UserGroup> project = userGroups.stream().filter(ug -> projectGroupIds.contains(ug.getGroupId())) if (CollectionUtils.isNotEmpty(projectUserGroups)) {
.collect(Collectors.toList()); return;
if (CollectionUtils.isEmpty(project)) {
// 项目用户组为空切换工作空间
List<String> orgIds = user.getGroups()
.stream()
.filter(ug -> StringUtils.equals(ug.getType(), UserGroupType.ORGANIZATION))
.map(Group::getId)
.collect(Collectors.toList());
List<String> testIds = user.getGroups()
.stream()
.filter(ug -> StringUtils.equals(ug.getType(), UserGroupType.WORKSPACE))
.map(Group::getId)
.collect(Collectors.toList());
List<UserGroup> org = userGroups.stream().filter(ug -> orgIds.contains(ug.getGroupId()))
.collect(Collectors.toList());
List<UserGroup> test = userGroups.stream().filter(ug -> testIds.contains(ug.getGroupId()))
.collect(Collectors.toList());
if (test.size() > 0) {
String wsId = test.get(0).getSourceId();
switchUserRole("workspace", wsId);
} else if (org.size() > 0) {
String orgId = org.get(0).getSourceId();
switchUserRole("organization", orgId);
}
} else {
UserGroup userGroup = project.stream().filter(p -> StringUtils.isNotBlank(p.getSourceId()))
.collect(Collectors.toList()).get(0);
String projectId = userGroup.getSourceId();
Project p = projectMapper.selectByPrimaryKey(projectId);
String wsId = p.getWorkspaceId();
Workspace workspace = workspaceMapper.selectByPrimaryKey(wsId);
String orgId = workspace.getOrganizationId();
user.setId(user.getId());
user.setLastProjectId(projectId);
user.setLastWorkspaceId(wsId);
user.setLastOrganizationId(orgId);
updateUser(user);
SecurityUtils.getSubject().getSession().setAttribute(ATTR_USER, user);
} }
} }
List<UserGroup> userGroups = user.getUserGroups();
List<String> projectGroupIds = user.getGroups()
.stream().filter(ug -> StringUtils.equals(ug.getType(), UserGroupType.PROJECT))
.map(Group::getId)
.collect(Collectors.toList());
List<UserGroup> project = userGroups.stream().filter(ug -> projectGroupIds.contains(ug.getGroupId()))
.collect(Collectors.toList());
if (CollectionUtils.isEmpty(project)) {
// 项目用户组为空切换工作空间
List<String> orgIds = user.getGroups()
.stream()
.filter(ug -> StringUtils.equals(ug.getType(), UserGroupType.ORGANIZATION))
.map(Group::getId)
.collect(Collectors.toList());
List<String> testIds = user.getGroups()
.stream()
.filter(ug -> StringUtils.equals(ug.getType(), UserGroupType.WORKSPACE))
.map(Group::getId)
.collect(Collectors.toList());
List<UserGroup> org = userGroups.stream().filter(ug -> orgIds.contains(ug.getGroupId()))
.collect(Collectors.toList());
List<UserGroup> test = userGroups.stream().filter(ug -> testIds.contains(ug.getGroupId()))
.collect(Collectors.toList());
if (test.size() > 0) {
String wsId = test.get(0).getSourceId();
switchUserRole("workspace", wsId);
} else if (org.size() > 0) {
String orgId = org.get(0).getSourceId();
switchUserRole("organization", orgId);
}
} else {
UserGroup userGroup = project.stream().filter(p -> StringUtils.isNotBlank(p.getSourceId()))
.collect(Collectors.toList()).get(0);
String projectId = userGroup.getSourceId();
Project p = projectMapper.selectByPrimaryKey(projectId);
String wsId = p.getWorkspaceId();
Workspace workspace = workspaceMapper.selectByPrimaryKey(wsId);
String orgId = workspace.getOrganizationId();
user.setId(user.getId());
user.setLastProjectId(projectId);
user.setLastWorkspaceId(wsId);
user.setLastOrganizationId(orgId);
updateUser(user);
SecurityUtils.getSubject().getSession().setAttribute(ATTR_USER, user);
}
} }
public List<User> searchUser(String condition) { public List<User> searchUser(String condition) {