From 3b323e28698b611a2f7670d1829e429d9629068d Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Tue, 15 Nov 2016 13:43:40 +0800
Subject: [PATCH] =?UTF-8?q?added=20=E5=AE=9E=E7=8E=B0=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Base.php  | 2 +-
 application/admin/controller/Index.php | 9 ++++++++-
 application/config.php                 | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/application/admin/controller/Base.php b/application/admin/controller/Base.php
index 606814a..05536b1 100644
--- a/application/admin/controller/Base.php
+++ b/application/admin/controller/Base.php
@@ -93,7 +93,7 @@ class Base extends Controller {
 
     private function checkRule(){
         $check = (new \Permission())->check($this->url, $this->uid);
-        if( !$check ){
+        if( !$check && !isAdministrator() ){
             $this->error('权限认证失败！', '');
         }
     }
diff --git a/application/admin/controller/Index.php b/application/admin/controller/Index.php
index 41d929e..319af6e 100644
--- a/application/admin/controller/Index.php
+++ b/application/admin/controller/Index.php
@@ -8,9 +8,16 @@ class Index extends Base  {
         $dataObj = Menu::all(function($query){
             $query->order('sort', 'asc');
         });
+        $authList = (new \Permission())->getAuthList($this->uid);
         foreach ($dataObj as $value){
             if( !$value->hide ){
-                $data[] = $value->toArray();
+                if( isAdministrator() ){
+                    $data[] = $value->toArray();
+                }else{
+                    if( (isset($authList[$value->url]) && $authList[$value->url]) || empty($value->url) ){
+                        $data[] = $value->toArray();
+                    }
+                }
             }
         }
         $data = listToTree($data);
diff --git a/application/config.php b/application/config.php
index 673d25e..82afc14 100644
--- a/application/config.php
+++ b/application/config.php
@@ -15,7 +15,7 @@ return [
     'WEBSITE_DOMAIN' => 'http://www.7d-vision.com', //官方网址
     'COMPANY_NAME'   => '北京七维视觉科技有限公司', //公司名称
     'SQL_PRIMARY_KEY' => 'id',
-    'USER_ADMINISTRATOR' => 1,
+    'USER_ADMINISTRATOR' => 4,
 
     // +----------------------------------------------------------------------
     // | 应用设置