From 358b786990fe86ac80c358ded3925cf3ab835d83 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 27 Jan 2022 14:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=A1=A5=E8=B4=B4=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Renderable/Grid/Filter/DealerEarningStatusIn.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

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;
                     }
                 }