From c1d41f7b73d1994d9de7e885a3524c31d642b71e Mon Sep 17 00:00:00 2001
From: denghy <denghy@fxft.net>
Date: Tue, 26 Feb 2019 17:05:59 +0800
Subject: [PATCH] month

---
 app/Domains/Virtual/Repositories/FlowPoolRepository.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/Domains/Virtual/Repositories/FlowPoolRepository.php b/app/Domains/Virtual/Repositories/FlowPoolRepository.php
index 49d82414..82d25578 100644
--- a/app/Domains/Virtual/Repositories/FlowPoolRepository.php
+++ b/app/Domains/Virtual/Repositories/FlowPoolRepository.php
@@ -76,7 +76,9 @@ class FlowPoolRepository extends Repository
         if (isset($conditions['month'])) {
             $time = Carbon::parse($conditions['month'])->format('Y-m-d H:i:s');
             $this->model = $this->model->where(function ($subQuery) use ($time) {
-                $subQuery->where('start_at', '<=', $time)->where('end_at', '>=', $time);
+                $subQuery->where('start_at', '<=', $time)->where(function ($endAtQuery) use ($time) {
+                    $endAtQuery->where('end_at', '>=', $time)->orWhereNull('end_at');
+                });
             });
         }