fixed removing manager from group

ONLYOFFICE · Aug 6, 2024 · f725d28 · f725d28
1 parent 81cc5c0
commit f725d28
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/common/ASC.Core.Common/Context/Impl/UserManager.cs b/common/ASC.Core.Common/Context/Impl/UserManager.cs
@@ -723,6 +723,7 @@ public async Task RemoveUserFromGroupAsync(Guid userId, Guid groupId)
             return;
         }
 
+        var managerIdTask = GetDepartmentManagerAsync(groupId);
         var user = await GetUsersAsync(userId);
         var isUserBefore = await this.IsUserAsync(user);
         var isPaidUserBefore = await IsPaidUserAsync(user);
@@ -731,6 +732,12 @@ await permissionContext.DemandPermissionsAsync(new UserGroupObject(new UserAccou
             Constants.Action_EditGroups);
 
         await userService.RemoveUserGroupRefAsync(Tenant.Id, userId, groupId, UserGroupRefType.Contains);
+
+        var managerId = await managerIdTask;
+        if (managerId == userId)
+        {
+            await userService.RemoveUserGroupRefAsync(Tenant.Id, userId, groupId, UserGroupRefType.Manager);
+        }
 
         ResetGroupCache(userId);