From 6d789258730ab42a577e7a1c026e624b93adba64 Mon Sep 17 00:00:00 2001 From: Devil Date: Thu, 12 Sep 2019 23:30:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/AdminPowerService.php | 4 ++-- application/service/UserService.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/service/AdminPowerService.php b/application/service/AdminPowerService.php index 2994282cb..52564769d 100755 --- a/application/service/AdminPowerService.php +++ b/application/service/AdminPowerService.php @@ -35,7 +35,7 @@ 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(); if(!empty($data)) { @@ -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 f35145a8f..437c2e4e2 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)) { From bb78ef496768c51c66525727edcce977c8edc99c Mon Sep 17 00:00:00 2001 From: Devil Date: Thu, 12 Sep 2019 23:36:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/AdminPowerService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/service/AdminPowerService.php b/application/service/AdminPowerService.php index 52564769d..f3d1c5691 100755 --- a/application/service/AdminPowerService.php +++ b/application/service/AdminPowerService.php @@ -36,7 +36,7 @@ class AdminPowerService $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) From fe38edcfd9c16cc7bdadc0a45b7d6eb21bf4083e Mon Sep 17 00:00:00 2001 From: Devil Date: Fri, 13 Sep 2019 22:05:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=A0=81?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E6=96=B0=E5=A2=9E19=2016=E5=8F=B7=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/lang/zh-cn.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/lang/zh-cn.php b/application/lang/zh-cn.php index e7a216691..ac6dbbbf5 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}$',