From b86493496915849f82c9437a2572500284e6d005 Mon Sep 17 00:00:00 2001 From: zhengyongxing Date: Mon, 2 Mar 2020 14:57:58 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=AD=9B=E9=80=89=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserActionLogController.class.php | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/Application/Admin/Controller/UserActionLogController.class.php b/Application/Admin/Controller/UserActionLogController.class.php index 555e43a64..47f9ca957 100644 --- a/Application/Admin/Controller/UserActionLogController.class.php +++ b/Application/Admin/Controller/UserActionLogController.class.php @@ -39,12 +39,12 @@ class UserActionLogController extends AdminController } if (!$_REQUEST['time_start']&&$_REQUEST['time_end']) { - $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; + $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])+86399]; } if ($_REQUEST['time_start']&&$_REQUEST['time_end']) { - $map['create_time'] = ['egt',strtotime($_REQUEST['time_start'])]; - $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; + $map['create_time'] = ['between',[strtotime($_REQUEST['time_start']),strtotime($_REQUEST['time_end'])+86399]]; +// $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; } if ($_REQUEST['username']) { @@ -123,12 +123,13 @@ class UserActionLogController extends AdminController } if (!$_REQUEST['time_start']&&$_REQUEST['time_end']) { - $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; + $map['create_time'] = ['elt',strtotime($_REQUEST['time_end']+86399)]; } if ($_REQUEST['time_start']&&$_REQUEST['time_end']) { - $map['create_time'] = ['egt',strtotime($_REQUEST['time_start'])]; - $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; +// $map['create_time'] = ['egt',strtotime($_REQUEST['time_start'])]; +// $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; + $map['create_time'] = ['between',[strtotime($_REQUEST['time_start']),strtotime($_REQUEST['time_end'])+86399]]; } if ($_REQUEST['username']) { @@ -227,12 +228,13 @@ class UserActionLogController extends AdminController } if (!$_REQUEST['time_start']&&$_REQUEST['time_end']) { - $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; + $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])+86399]; } if ($_REQUEST['time_start']&&$_REQUEST['time_end']) { - $map['create_time'] = ['egt',strtotime($_REQUEST['time_start'])]; - $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; +// $map['create_time'] = ['egt',strtotime($_REQUEST['time_start'])]; +// $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; + $map['create_time'] = ['between',[strtotime($_REQUEST['time_start']),strtotime($_REQUEST['time_end'])+86399]]; } if ($_REQUEST['adminname']) { @@ -295,12 +297,13 @@ class UserActionLogController extends AdminController } if (!$_REQUEST['time_start']&&$_REQUEST['time_end']) { - $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; + $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])+86399]; } if ($_REQUEST['time_start']&&$_REQUEST['time_end']) { - $map['create_time'] = ['egt',strtotime($_REQUEST['time_start'])]; - $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; +// $map['create_time'] = ['egt',strtotime($_REQUEST['time_start'])]; +// $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])]; + $map['create_time'] = ['between',[strtotime($_REQUEST['time_start']),strtotime($_REQUEST['time_end'])+86399]]; } if ($_REQUEST['adminname']) {