From 2c8fe037de09436013a2e22ead2bb6b84c172364 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Fri, 11 Jan 2019 01:04:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E6=96=B0=E7=9A=84=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E6=9D=83=E9=99=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Common.php         |  3 ++-
 application/admin/view/default/public/menu.html |  4 ++--
 application/service/AdminPowerService.php       | 16 ++++++++--------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/application/admin/controller/Common.php b/application/admin/controller/Common.php
index 96d6df9cd..fbe3b4dce 100755
--- a/application/admin/controller/Common.php
+++ b/application/admin/controller/Common.php
@@ -154,7 +154,8 @@ class Common extends Controller
 		if(!in_array(strtolower(request()->action()), $unwanted_power))
 		{
 			// 角色组权限列表校验
-			if(!in_array(strtolower(request()->controller().'_'.request()->action()), $this->power))
+			$power = empty($this->power) ? [] : $this->power;
+            if(!in_array(strtolower(request()->controller().'_'.request()->action()), $power))
 			{
                 if(IS_AJAX)
                 {
diff --git a/application/admin/view/default/public/menu.html b/application/admin/view/default/public/menu.html
index 3fae22038..ebc4f38bf 100755
--- a/application/admin/view/default/public/menu.html
+++ b/application/admin/view/default/public/menu.html
@@ -8,7 +8,7 @@
 				</a>
 			</li>
 			{{foreach $left_menu as $v}}
-				{{if empty($v['item'])}}
+				{{if empty($v['items'])}}
 					<li>
 						<a href="javascript:;" data-type="menu" data-url="{{:MyUrl('admin/'.strtolower($v['control']).'/'.strtolower($v['action']))}}">
 							{{if !empty($v['icon'])}}<span class="iconfont {{$v.icon}}"></span>{{/if}}
@@ -23,7 +23,7 @@
 							<i class="am-icon-angle-down am-fr am-margin-right left-menu-more-ico-rotate"></i>
 						</a>
 						<ul class="am-list am-collapse admin-sidebar-sub" id="power-menu-{{$v.id}}">
-							{{foreach $v.item as $vs}}
+							{{foreach $v.items as $vs}}
 								<li>
 									<a href="javascript:;" data-type="menu" data-url="{{:MyUrl('admin/'.strtolower($vs['control']).'/'.strtolower($vs['action']))}}">
 										{{if !empty($vs['icon'])}}<span class="{{$vs.icon}}"></span>{{/if}}
diff --git a/application/service/AdminPowerService.php b/application/service/AdminPowerService.php
index 28fb621f2..16489fe3e 100755
--- a/application/service/AdminPowerService.php
+++ b/application/service/AdminPowerService.php
@@ -452,7 +452,7 @@ class AdminPowerService
         if(($role_id > 0 || $admin_id == 1) && empty($admin_left_menu))
         {
             // 获取一级数据
-            if($admin_id == 1)
+            if($admin_id == 1 || $role_id == 1)
             {
                 $field = 'id,name,control,action,is_show,icon';
                 $admin_left_menu = Db::name('Power')->where(array('pid' => 0))->field($field)->order('sort')->select();
@@ -470,17 +470,17 @@ class AdminPowerService
                     $admin_power[$v['id']] = strtolower($v['control'].'_'.$v['action']);
 
                     // 获取子权限
-                    if($admin_id == 1)
+                    if($admin_id == 1 || $role_id == 1)
                     {
-                        $item = Db::name('Power')->where(array('pid' => $v['id']))->field($field)->order('sort')->select();
+                        $items = Db::name('Power')->where(array('pid' => $v['id']))->field($field)->order('sort')->select();
                     } else {
-                        $item = Db::name('Power')->alias('p')->join(['__ROLE_POWER__'=>'rp'], 'p.id=rp.power_id')->where(array('rp.role_id' => $role_id, 'p.pid' => $v['id']))->field($field)->order('p.sort')->select();
+                        $items = Db::name('Power')->alias('p')->join(['__ROLE_POWER__'=>'rp'], 'p.id=rp.power_id')->where(array('rp.role_id' => $role_id, 'p.pid' => $v['id']))->field($field)->order('p.sort')->select();
                     }
 
                     // 权限列表
-                    if(!empty($item))
+                    if(!empty($items))
                     {
-                        foreach($item as $ks=>$vs)
+                        foreach($items as $ks=>$vs)
                         {
                             // 权限
                             $admin_power[$vs['id']] = strtolower($vs['control'].'_'.$vs['action']);
@@ -488,7 +488,7 @@ class AdminPowerService
                             // 是否显示视图
                             if($vs['is_show'] == 0)
                             {
-                                unset($item[$ks]);
+                                unset($items[$ks]);
                             }
                         }
                     }
@@ -497,7 +497,7 @@ class AdminPowerService
                     if($v['is_show'] == 1)
                     {
                         // 子级
-                        $admin_left_menu[$k]['item'] = $item;
+                        $admin_left_menu[$k]['items'] = $items;
                     } else {
                         unset($admin_left_menu[$k]);
                     }