diff --git a/asg_form/Controllers/BlackController.cs b/asg_form/Controllers/BlackController.cs
index c902057..f9ddd5b 100644
--- a/asg_form/Controllers/BlackController.cs
+++ b/asg_form/Controllers/BlackController.cs
@@ -176,7 +176,7 @@ namespace asg_form.Controllers
                 var TotalRecords = await query.CountAsync();
 
                 var Tasks = await query
-                    .Where(g => g.record_time.Contains(recordYear) && g.violator==violator)
+                    .Where(g => (recordYear==null || g.record_time.Contains(recordYear)) && (g.violator==violator || violator==null))
                     .OrderByDescending(n => n.record_time)
                     .Skip((page - 1) * limit)
                     .Take(limit)