diff --git a/app/Admin/Renderable/Grid/Filter/DealerEarningStatusIn.php b/app/Admin/Renderable/Grid/Filter/DealerEarningStatusIn.php index e007fe78..e54e45af 100644 --- a/app/Admin/Renderable/Grid/Filter/DealerEarningStatusIn.php +++ b/app/Admin/Renderable/Grid/Filter/DealerEarningStatusIn.php @@ -52,13 +52,19 @@ class DealerEarningStatusIn extends Filter $query->orWhereNull('settle_at'); break; case 0: - $query->orWhere('status', 0); + $query->orWhere(function ($q) { + return $q->whereNotNull('settle_at')->where('status', 0); + }); break; case 1: - $query->orWhere('status', 1); + $query->orWhere(function ($q) { + return $q->whereNotNull('settle_at')->where('status', 1); + }); break; case 5: - $query->orWhere('status', 5); + $query->orWhere(function ($q) { + return $q->whereNotNull('settle_at')->where('status', 5); + }); break; } }