From c72ce381c06c96e1b46234d472c4474248c7da23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=B1=E7=A8=8B=E6=BC=AB=E6=82=9F?= <41945635+TimeBomb2018@users.noreply.github.com> Date: Thu, 26 Feb 2026 14:47:57 +0800 Subject: [PATCH] fix(workspace member) (#407) * fix(workspace member): After the space inviter is removed, it can still be invited again. * fix(login): fix login bug --- api/app/repositories/workspace_repository.py | 1 + api/app/schemas/token_schema.py | 2 +- api/app/services/workspace_service.py | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/api/app/repositories/workspace_repository.py b/api/app/repositories/workspace_repository.py index 70ed7521..87b0e20f 100644 --- a/api/app/repositories/workspace_repository.py +++ b/api/app/repositories/workspace_repository.py @@ -115,6 +115,7 @@ class WorkspaceRepository: self.db.query(Workspace) .join(WorkspaceMember, Workspace.id == WorkspaceMember.workspace_id) .filter(WorkspaceMember.user_id == user_id) + .filter(WorkspaceMember.is_active.is_(True)) .filter(Workspace.is_active.is_(True)) .order_by(Workspace.updated_at.desc()) .all() diff --git a/api/app/schemas/token_schema.py b/api/app/schemas/token_schema.py index b10a3a14..3bbea35e 100644 --- a/api/app/schemas/token_schema.py +++ b/api/app/schemas/token_schema.py @@ -26,6 +26,6 @@ class RefreshTokenRequest(BaseModel): class TokenRequest(BaseModel): email: EmailStr password: str - invite: Optional[str] = None, + invite: Optional[str] = None username: Optional[str] = None diff --git a/api/app/services/workspace_service.py b/api/app/services/workspace_service.py index 9ee98fa0..6f102695 100644 --- a/api/app/services/workspace_service.py +++ b/api/app/services/workspace_service.py @@ -70,10 +70,10 @@ def delete_workspace_member( _check_workspace_admin_permission(db, workspace_id, user) workspace_member = workspace_repository.get_member_by_id(db=db, member_id=member_id) if not workspace_member: - raise BusinessException(f"工作空间成员 {member_id} 不存在", BizCode.WORKSPACE_MEMBER_NOT_FOUND) + raise BusinessException(f"工作空间成员 {member_id} 不存在", BizCode.WORKSPACE_NOT_FOUND) if workspace_member.workspace_id != workspace_id: - raise BusinessException(f"工作空间成员 {member_id} 不存在于工作空间 {workspace_id}", BizCode.WORKSPACE_MEMBER_NOT_FOUND) + raise BusinessException(f"工作空间成员 {member_id} 不存在于工作空间 {workspace_id}", BizCode.WORKSPACE_NOT_FOUND) try: workspace_member.is_active = False