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']) {