diff --git a/Application/Admin/Controller/UserController.class.php b/Application/Admin/Controller/UserController.class.php index 8c95a0240..33701ba89 100644 --- a/Application/Admin/Controller/UserController.class.php +++ b/Application/Admin/Controller/UserController.class.php @@ -646,6 +646,15 @@ class UserController extends AdminController $map['sdk_version'] = trim($_REQUEST['game_type']); unset($_REQUEST['game_type']); } + + if (isset($_REQUEST['time_start']) && isset($_REQUEST['time_end'])) { + $map['create_time'] = ['between', [strtotime(I('time_start')), strtotime(I('time_end')) + 86399]]; + } elseif (isset($_REQUEST['time_start'])) { + $map['create_time'] = ['GT', strtotime(I('time_start'))]; + } elseif (isset($_REQUEST['time_end'])) { + $map['create_time'] = ['LT', strtotime(I('time_end')) + 86399]; + } + empty(I('user_account')) || $map['user_account'] = ['like', "%" . I('user_account') . "%"]; $list = $this->lists(M('user_play_info', 'tab_'), $map, 'play_time desc'); $this->assign('list', $list); diff --git a/Application/Admin/View/User/rolelist.html b/Application/Admin/View/User/rolelist.html index e565a8218..861926e81 100644 --- a/Application/Admin/View/User/rolelist.html +++ b/Application/Admin/View/User/rolelist.html @@ -4,6 +4,7 @@ +