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:
CaptainB 2022-06-17 14:13:42 +08:00 committed by 刘瑞斌
parent bc4d8de7e2
commit f835cdf21d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -689,7 +689,17 @@ public class UserService {
List<UserGroup> projectUserGroups = user.getUserGroups().stream() List<UserGroup> projectUserGroups = user.getUserGroups().stream()
.filter(ug -> StringUtils.equals(user.getLastProjectId(), ug.getSourceId())) .filter(ug -> StringUtils.equals(user.getLastProjectId(), ug.getSourceId()))
.collect(Collectors.toList()); .collect(Collectors.toList());
return CollectionUtils.isNotEmpty(projectUserGroups); if (CollectionUtils.isNotEmpty(projectUserGroups)) {
Project project = projectMapper.selectByPrimaryKey(user.getLastProjectId());
if (StringUtils.equals(project.getWorkspaceId(), user.getLastWorkspaceId())) {
return true;
}
// last_project_id 和 last_workspace_id 对应不上了
user.setLastWorkspaceId(project.getWorkspaceId());
updateUser(user);
SessionUtils.putUser(SessionUser.fromUser(user));
return true;
}
} }
return false; return false;
} }