Quellcode durchsuchen

[智价云] 登录更新

tangyuanwang vor 2 Monaten
Ursprung
Commit
03e38fa57c
2 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
  1. 2 2
      app/Http/Controllers/Manager/Login.php
  2. 2 2
      app/Models/Manager/AuthRule.php

+ 2 - 2
app/Http/Controllers/Manager/Login.php

@@ -53,7 +53,7 @@ class Login extends Manager
 			// 获取权限列表
 			$accessToken['username']			= $admin['username'];
 			// 获取权限列表
-			$accessToken['auth_rules']			= $AuthRule->getAuthList($admin['uid'], 'manager');
+			$accessToken['auth_rules']			= $AuthRule->getAuthList($admin['uid'],'1', 'manager');
 		} else {
 			$admin    	= $EmployeeModel->where('employee_code', $username)->first(['id as uid', 'name as username', 'mobile as phone', 'status', 'password', 'insert_time', 'update_time']);
 			// 用户不存在
@@ -70,7 +70,7 @@ class Login extends Manager
 			if (isset($accessToken['error'])) 	return json_send(['code' => 'error', 'msg' => '登录失败', 'data' => $accessToken['data']]);
 			// 获取权限列表
 			$accessToken['username']			= $admin['username'];
-			$accessToken['auth_rules']			= $AuthRule->getAuthList($admin['uid'], 'manager');
+			$accessToken['auth_rules']			= $AuthRule->getAuthList($admin['uid'],'0','manager');
 		}
 		
 		// 表单令牌

+ 2 - 2
app/Models/Manager/AuthRule.php

@@ -102,9 +102,9 @@ class AuthRule extends Model
      * @param integer $uid  用户id
      * @param integer $type
      */
-    public function getAuthList($uid,$module='manager')
+    public function getAuthList($uid,$is_admin,$module='manager')
     {
-        if( is_super($uid,$module) ){
+        if( is_super($uid,$is_admin,$module) ){
             $rules					=  (new Menu)->getList($module,true);
             $rules                  = array_column($rules,'url');
         }else{