From 534497a9ef32c9f392900451d4ded74570e78d63 Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Wed, 26 Nov 2025 14:35:01 +0800
Subject: [PATCH] update

---
 app/Http/Controllers/Admin/VisitController.php | 8 ++++----
 app/Models/Visit.php                           | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Http/Controllers/Admin/VisitController.php b/app/Http/Controllers/Admin/VisitController.php
index 6fa6002..b38c451 100644
--- a/app/Http/Controllers/Admin/VisitController.php
+++ b/app/Http/Controllers/Admin/VisitController.php
@@ -58,11 +58,11 @@ class VisitController extends CommonController
                 $query->where('type', $all['type']);
             }
             if (isset($all['start_date']) && isset($all['end_date'])) {
-                $query->where(function ($q) use ($all) {
-                    $q->whereBetween('start_date', [$all['start_date'], $all['end_date']])
-                        ->orWhereBetween('end_date', [$all['start_date'], $all['end_date']]);
-                });
+                // 查询日期范围与数据库日期范围有交集
+                $query->where('start_date', '<=', $all['end_date'])
+                    ->where('end_date', '>=', $all['start_date']);
             }
+
             if (isset($all['my_self']) && !empty($all['my_self'])) {
                 $query->where('admin_id', $this->getUserId());
             }
diff --git a/app/Models/Visit.php b/app/Models/Visit.php
index 3552ec2..9952eed 100644
--- a/app/Models/Visit.php
+++ b/app/Models/Visit.php
@@ -171,8 +171,8 @@ class Visit extends SoftDeletesModel
             }
             if ($startDate && $endDate) {
                 $query->where(function ($q) use ($startDate, $endDate) {
-                    $q->whereBetween('start_date', [$startDate, $endDate])
-                        ->orWhereBetween('end_date', [$startDate, $endDate]);
+                    $q->where('start_date', '<=', $endDate)
+                        ->where('end_date', '>=', $startDate);
                 });
             }
         })->get();