From 67053ab8aeb23440934ef2581af3499ae56be95b Mon Sep 17 00:00:00 2001 From: Timebomb2018 <18868801967@163.com> Date: Thu, 26 Feb 2026 13:35:07 +0800 Subject: [PATCH] fix(workspace member): After the space inviter is removed, it can still be invited again. --- api/app/repositories/workspace_repository.py | 1 + api/app/services/workspace_service.py | 4 ++-- 2 files changed, 3 insertions(+), 2 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/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