From efd02f113080e137514cb4f0bf5308672d95a7a6 Mon Sep 17 00:00:00 2001
From: zhaoxiang <zhaoxiang051405@gmail.com>
Date: Sat, 3 Mar 2018 15:48:00 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E6=96=B0=E5=A2=9E=E5=8A=A0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Login.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index de3a2c5..ce63ca2 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -9,6 +9,8 @@ namespace app\admin\controller;
 
 
 use app\model\ApiAuthGroupAccess;
+use app\model\ApiAuthRule;
+use app\model\ApiMenu;
 use app\model\ApiUser;
 use app\model\ApiUserData;
 use app\util\ReturnCode;
@@ -44,12 +46,14 @@ class Login extends Base {
                     $data['loginTimes'] = $userData['loginTimes'] + 1;
                     $data['lastLoginIp'] = $this->request->ip(1);
                     $data['lastLoginTime'] = time();
+                    $return['headImg'] = $userData['headImg'];
                     ApiUserData::update($data, ['uid' => $userInfo['id']]);
                 } else {
                     $data['loginTimes'] = 1;
                     $data['uid'] = $userInfo['id'];
                     $data['lastLoginIp'] = $this->request->ip(1);
                     $data['lastLoginTime'] = time();
+                    $return['headImg'] = '';
                     ApiUserData::create($data);
                 }
             } else {
@@ -65,15 +69,15 @@ class Login extends Base {
         $return['access'] = 1000000;
         $isSupper = Tools::isAdministrator($userInfo['id']);
         if ($isSupper) {
-            $return['access'] = 0;
+            $access = ApiMenu::all(['hide' => 0]);
+            $access = Tools::buildArrFromObj($access);
+            $return['access'] = array_values(array_filter(array_column($access, 'url')));
         } else {
             $groups = ApiAuthGroupAccess::get(['uid' => $userInfo['id']]);
             if (isset($groups) || $groups->groupId) {
-                if (strpos($groups->groupId, ',') === false) {
-                    $return['access'] = intval($groups->groupId);
-                } else {
-                    $return['access'] = explode(',', $groups->groupId);
-                }
+                $access = (new ApiAuthRule())->whereIn('groupId', $groups->groupId)->select();
+                $access = Tools::buildArrFromObj($access);
+                $return['access'] = array_values(array_unique(array_column($access, 'url')));
             }
         }