update

app/Http/Controllers/Admin/CalendarsController.php

@@ -49,16 +49,13 @@ class CalendarsController extends BaseController
     public function index()
     {
         $all = \request()->all();
-        $messages = [
+        $list = Calendar::with('course', 'courseContent')
-            'month.required' => '月份必填',
+            ->where(function ($query) use ($all) {
-        ];
+                if (isset($all['month'])) {
-        $validator = Validator::make($all, [
+                    $query->where('start_time', 'like', $all['month'] . '%');
-            'month' => 'required',
+                }
-        ], $messages);
+            })->orderBy('date')
-        if ($validator->fails()) {
+            ->get();
-            return $this->fail([ResponseCode::ERROR_PARAMETER, implode(',', $validator->errors()->all())]);
-        }
-        $list = Calendar::with('course', 'courseContent')->where('start_time', 'like', $all['month'] . '%')->orderBy('date')->get();
         if (isset($all['is_export']) && $all['is_export'] == 1) {
             $list = $list->toArray();
             return Excel::download(new CommonExport($list, $all['export_fields'] ?? ''), ($all['file_name'] ?? '') . date('YmdHis') . '.xlsx');