Merge remote-tracking branch 'online/master'

app/Models/CourseSign.php

@@ -90,8 +90,10 @@ class CourseSign extends SoftDeletesModel
             $query->where('is_chart', 1);
             // 开始结束日期的筛选。or查询
             if ($start_date && $end_date) {
-                $query->whereBetween('start_date', [$start_date, $end_date])
-                    ->orWhereBetween('end_date', [$start_date, $end_date]);
+                $query->where(function ($query) use ($start_date, $end_date) {
+                    $query->whereBetween('start_date', [$start_date, $end_date])
+                        ->orWhereBetween('end_date', [$start_date, $end_date]);
+                });
             }
         })->whereNotIn('status', [4, 5, 6]);
         return $baseQuery;