From d533076717767d6d4212f8fee1079493fbd60221 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=84=E5=B0=98?= <122383162@qq.com> Date: Thu, 20 Aug 2020 09:32:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=B6=E9=97=B4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/Activity/IndexController.php | 9 +++++++-- app/Models/Log.php | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/Admin/Controllers/Activity/IndexController.php b/app/Admin/Controllers/Activity/IndexController.php index a227959..4c160e5 100644 --- a/app/Admin/Controllers/Activity/IndexController.php +++ b/app/Admin/Controllers/Activity/IndexController.php @@ -133,8 +133,13 @@ class IndexController extends AdminController return back()->withInput()->with(compact('error')); } - $form->start_at = $form->start_at . ' 00:00:01'; - $form->end_at = $form->end_at . ' 23:59:59'; + if (request()->start) { + $form->start_at = $form->start_at . ' 00:00:01'; + } + + if (request()->end_at) { + $form->end_at = $form->end_at . ' 23:59:59'; + } }); return $form; diff --git a/app/Models/Log.php b/app/Models/Log.php index bed92cd..52a631e 100644 --- a/app/Models/Log.php +++ b/app/Models/Log.php @@ -9,11 +9,11 @@ use Schema; class Log extends Model { - protected $guarded = ['id']; + protected $guarded; protected $table; - protected $casts = [ + protected $casts = [ 'in_source' => 'array', 'out_source' => 'array', ];