From 79f1369a0c7410781bb968821d32c0511884036b Mon Sep 17 00:00:00 2001
From: jonny-xhl <xianghl@cy-coo.com>
Date: Wed, 9 Sep 2020 21:31:42 +0800
Subject: [PATCH] resolved conflicts

---
 .../Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs
index 62c26d236d..f6ae630eda 100644
--- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs
+++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs
@@ -212,6 +212,12 @@ namespace Volo.Abp.Identity.MongoDB
                 .CountAsync(GetCancellationToken(cancellationToken));
         }
 
+        public virtual Task RemoveAllRolesAsync(OrganizationUnit organizationUnit, CancellationToken cancellationToken = default)
+        {
+            organizationUnit.Roles.Clear();
+            return Task.FromResult(0);
+        }
+
         public virtual async Task RemoveAllMembersAsync(OrganizationUnit organizationUnit,
             CancellationToken cancellationToken = default)
         {