修改代理人拼团活动列表

app/api/lists/property/PropertyGroupActivityLists.php

@@ -34,7 +34,10 @@ class PropertyGroupActivityLists extends BaseApiDataLists implements ListsSearch
         if (isset($this->params['start_time']) && !empty($this->params['start_time'])) {
             $monthStart = strtotime(date("Y-m-01",strtotime($this->params['start_time'])));
             $monthEnd = strtotime(date("Y-m-t 23:59:59",strtotime($this->params['start_time'])));
-            $where[] = ['start_time', 'between', [$monthStart, $monthEnd]];
+            $where[] = function($query) use ($monthStart, $monthEnd) {
+                $query->where('start_time', 'between', [$monthStart, $monthEnd])
+                ->whereOr('end_time', 'between', [$monthStart, $monthEnd]);
+            };
         }
         return $where;
     }