adai/MemoryBear
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(workspace member): After the space inviter is removed, it can still be invited again.

Browse Source
This commit is contained in:
Timebomb2018
2026-02-26 13:35:07 +08:00
parent 2ef54168fc
commit 67053ab8ae
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/app/repositories/workspace_repository.py
View File

@@ -115,6 +115,7 @@ class WorkspaceRepository:
self.db.query(Workspace) self.db.query(Workspace)
.join(WorkspaceMember, Workspace.id == WorkspaceMember.workspace_id) .join(WorkspaceMember, Workspace.id == WorkspaceMember.workspace_id)
.filter(WorkspaceMember.user_id == user_id) .filter(WorkspaceMember.user_id == user_id)
.filter(WorkspaceMember.is_active.is_(True))
.filter(Workspace.is_active.is_(True)) .filter(Workspace.is_active.is_(True))
.order_by(Workspace.updated_at.desc()) .order_by(Workspace.updated_at.desc())
.all() .all()

4
api/app/services/workspace_service.py
View File

@@ -70,10 +70,10 @@ def delete_workspace_member(
_check_workspace_admin_permission(db, workspace_id, user) _check_workspace_admin_permission(db, workspace_id, user)
workspace_member = workspace_repository.get_member_by_id(db=db, member_id=member_id) workspace_member = workspace_repository.get_member_by_id(db=db, member_id=member_id)
if not workspace_member: 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: 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: try:
workspace_member.is_active = False workspace_member.is_active = False