diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php index d00e64a12..824276b35 100644 --- a/Application/Admin/Controller/ExportController.class.php +++ b/Application/Admin/Controller/ExportController.class.php @@ -225,6 +225,11 @@ class ExportController extends Controller } + if (isset($_REQUEST['user_id'])) { + $map['tab_user.id'] = $_REQUEST['user_id']; + unset($_REQUEST['user_id']); + } + if (isset($_REQUEST['device_number'])) { $map['tab_user.device_number'] = $_REQUEST['device_number']; unset($_REQUEST['device_number']); diff --git a/Application/Admin/Controller/MemberController.class.php b/Application/Admin/Controller/MemberController.class.php index 0dd00f39e..fe33c0cf9 100644 --- a/Application/Admin/Controller/MemberController.class.php +++ b/Application/Admin/Controller/MemberController.class.php @@ -61,6 +61,13 @@ class MemberController extends ThinkController $maps['tab_user.register_type'] = ['in',[0,3,4,5,6]]; } } + + if (isset($_REQUEST['user_id'])) { + empty($hav) || $hav .= ' AND '; + $hav .= "tab_user.id = {$_REQUEST['user_id']}"; + $maps['tab_user.id'] = $_REQUEST['user_id']; + unset($_REQUEST['user_id']); + } if (isset($_REQUEST['account'])) { empty($hav) || $hav .= ' AND '; @@ -1148,6 +1155,9 @@ class MemberController extends ThinkController if (empty($type) || empty($tag)) { return $this->error("请填写完整信息"); } + if ($type == 2 && !preg_match("/(\.((2(5[0-5]|[0-4]\d))|[0-1]?\d{1,2})){3}/i", $tag)) { + return $this->error("请填写正确的ip信息,如127.0.0.1"); + } $map['type'] = $type; $map['tag'] = $tag; $item = M('device_bans', 'tab_')->where($map)->find(); diff --git a/Application/Admin/View/Member/user_info.html b/Application/Admin/View/Member/user_info.html index e7bab57aa..4f7d1b169 100644 --- a/Application/Admin/View/Member/user_info.html +++ b/Application/Admin/View/Member/user_info.html @@ -62,6 +62,9 @@ +
+   +