diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php index e7a216691baefa75cd5ae283f2d393da5c98046d..ac6dbbbf50780dceee5bf7da80edfcb400e03c6a 100755 --- a/application/lang/zh-cn.php +++ b/application/lang/zh-cn.php @@ -367,7 +367,7 @@ return array( 'common_regex_pwd' => '^.{6,18}$', // 手机号码 - 'common_regex_mobile' => '^1((3|5|8|7){1}\d{1})\d{8}$', + 'common_regex_mobile' => '^1((3|5|6|7|8|9){1}\d{1})\d{8}$', // 座机号码 'common_regex_tel' => '^\d{3,4}-?\d{8}$', diff --git a/application/service/AdminPowerService.php b/application/service/AdminPowerService.php index 2994282cb8c4f93430427a130eff486faaceed8a..f3d1c56911a9512bc2dd362700039b6c6acc5e6a 100755 --- a/application/service/AdminPowerService.php +++ b/application/service/AdminPowerService.php @@ -35,8 +35,8 @@ class AdminPowerService $field = empty($params['field']) ? '*' : $params['field']; $order_by = empty($params['order_by']) ? 'id desc' : trim($params['order_by']); - // 获取管理员列表 - $data = Db::name('Power')->where($where)->order($order_by)->select(); + // 获取权限菜单列表 + $data = Db::name('Power')->field($field)->where($where)->order($order_by)->select(); if(!empty($data)) { foreach($data as &$v) @@ -185,7 +185,7 @@ class AdminPowerService $field = empty($params['field']) ? '*' : $params['field']; $order_by = empty($params['order_by']) ? 'id desc' : trim($params['order_by']); - // 获取管理员列表 + // 获取角色列表 $data = Db::name('Role')->where($where)->order($order_by)->select(); if(!empty($data)) { diff --git a/application/service/UserService.php b/application/service/UserService.php index f35145a8f43bfa926050563cf0b39136b27fdd4e..437c2e4e2803801be337dda42b185d21adf3ae1e 100755 --- a/application/service/UserService.php +++ b/application/service/UserService.php @@ -133,7 +133,7 @@ class UserService $m = isset($params['m']) ? intval($params['m']) : 0; $n = isset($params['n']) ? intval($params['n']) : 10; - // 获取管理员列表 + // 获取用户列表 $data = Db::name('User')->where($where)->order($order_by)->limit($m, $n)->select(); if(!empty($data)) {