diff --git a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserService.java b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserService.java index 486d0eda92..7568b2b9c1 100644 --- a/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserService.java +++ b/backend/services/system-setting/src/main/java/io/metersphere/system/service/BaseUserService.java @@ -265,6 +265,7 @@ public class BaseUserService { if (StringUtils.equals("organization", sign)) { user.setLastOrganizationId(sourceId); sessionUser.setLastOrganizationId(sourceId); + user.setLastProjectId(StringUtils.EMPTY); List projects = getProjectListByWsAndUserId(sessionUser.getId(), sourceId); if (CollectionUtils.isNotEmpty(projects)) { user.setLastProjectId(projects.get(0).getId()); @@ -276,8 +277,6 @@ public class BaseUserService { if (CollectionUtils.isNotEmpty(allWsProject)) { user.setLastProjectId(allWsProject.get(0).getId()); } - } else { - user.setLastProjectId(StringUtils.EMPTY); } } }