xf 2 years ago
parent
commit
974e262dea

+ 1 - 1
src/Hotline.Api/Controllers/CallController.cs

@@ -158,7 +158,7 @@ namespace Hotline.Api.Controllers
         public async Task<PagedDto<Blacklist>> QueryPaged([FromQuery] BlacklistPagedDto dto)
         {
             var (total, items) = await _blacklistRepository.QueryPagedAsync(
-                d => true,
+                d => !d.IsDeleted,
                 d => d.OrderByDescending(x => x.CreationTime),
                 dto.PageIndex,
                 dto.PageSize,

+ 8 - 2
src/Hotline/CallCenter/BlackLists/BlacklistDomainService.cs

@@ -48,11 +48,17 @@ public class BlacklistDomainService : IBlacklistDomainService, IScopeDependency
     /// <summary>
     /// 删除黑名单信息
     /// </summary>
-    /// <param name="phoneNo"></param>
     public async Task RemoveAsync(string phoneNo, CancellationToken cancellationToken = default)
     {
         await _blackCache.RemoveAsync(Blacklist.GetKey(phoneNo), cancellationToken);
-        await _blacklistRepository.RemoveAsync(d => d.PhoneNo == phoneNo, true, cancellationToken);
+        var items = await _blacklistRepository.Queryable().Where(d => d.PhoneNo == phoneNo).ToListAsync();
+        if (items.Any())
+        {
+            foreach (var blacklist in items)
+            {
+                await _blacklistRepository.RemoveAsync(blacklist, true, cancellationToken);
+            }
+        }
     }
 
     /// <summary>