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:
fit2-zhao 2023-09-28 09:48:33 +08:00 committed by fit2-zhao
parent 05c863f62e
commit 685ca095d1
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserService.java
View File

@ -265,6 +265,7 @@ public class BaseUserService {
if (StringUtils.equals("organization", sign)) { if (StringUtils.equals("organization", sign)) {
user.setLastOrganizationId(sourceId); user.setLastOrganizationId(sourceId);
sessionUser.setLastOrganizationId(sourceId); sessionUser.setLastOrganizationId(sourceId);
user.setLastProjectId(StringUtils.EMPTY);
List<Project> projects = getProjectListByWsAndUserId(sessionUser.getId(), sourceId); List<Project> projects = getProjectListByWsAndUserId(sessionUser.getId(), sourceId);
if (CollectionUtils.isNotEmpty(projects)) { if (CollectionUtils.isNotEmpty(projects)) {
user.setLastProjectId(projects.get(0).getId()); user.setLastProjectId(projects.get(0).getId());
@ -276,8 +277,6 @@ public class BaseUserService {
if (CollectionUtils.isNotEmpty(allWsProject)) { if (CollectionUtils.isNotEmpty(allWsProject)) {
user.setLastProjectId(allWsProject.get(0).getId()); user.setLastProjectId(allWsProject.get(0).getId());
} }
} else {
user.setLastProjectId(StringUtils.EMPTY);
} }
} }
} }