floraachy/shopxo
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo.git synced 2024-12-03 04:19:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

创建新的管理员权限错误

Browse Source
This commit is contained in:
gongfuxiang 2019-01-11 01:04:12 +08:00
parent 32928d921a
commit 2c8fe037de
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/admin/controller/Common.php
View File

@ -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)
{

4
application/admin/view/default/public/menu.html
View File

@ -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}}

16
application/service/AdminPowerService.php
View File

@ -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]);
}