eric2046
diff --git a/‎app/Model/Admin.php
Lines changed: 12 additions & 4 deletions b/‎app/Model/Admin.php
Lines changed: 12 additions & 4 deletions
diff --git a/‎public/1.png
9.14 KB b/‎public/1.png
9.14 KB
diff --git a/‎public/2.png
146 KB b/‎public/2.png
146 KB
diff --git a/‎public/3.png
-354 KB b/‎public/3.png
-354 KB
diff --git a/‎public/4.png
-298 KB b/‎public/4.png
-298 KB
diff --git a/‎readme.md
Lines changed: 0 additions & 2 deletions b/‎readme.md
Lines changed: 0 additions & 2 deletions
diff --git a/‎resources/views/admin/rbac/role/index_list.blade.php
Lines changed: 1 addition & 1 deletion b/‎resources/views/admin/rbac/role/index_list.blade.php
Lines changed: 1 addition & 1 deletion
@@ -41,7 +41,11 @@ public function getNav()
             redirect(route('/'));
         }
         //自己
-        $self = Permission::where(['name' => Route::currentRouteName()])->first()->toArray();
+        $self = Permission::where(['name' => Route::currentRouteName()])->first();
+        if ($self) {
+            $self = $self->toArray();
+        }
+
         //当前用户含有权限的菜单
 
         $rules = cache('sys:rule:' . $this->id);
@@ -73,14 +77,18 @@ public function getNav()
             cache(['sys:menu:' . $this->id => $menu], env('APP_ENV') == 'local' ? 1 : 600);
         }
         //面包屑
-        $crumb      = Tree::getParents($rules, $self['id']);
-        $parent_ids = [$self['id']];
+        $crumb = Tree::getParents($rules, $self['id']);
+
+        $parent_ids = [];
+        if ($self) {
+            array_push($parent_ids, $self['id']);
+        }
+
         if ($crumb) {
             foreach ($crumb as $val) {
                 array_push($parent_ids, $val['id']);
             }
         }
-
         return compact('self', 'menu', 'crumb', 'parent_ids');
     }
 }
@@ -46,8 +46,6 @@ composer update
 ![2](/public/2.png "2")
 ![3](/public/3.png "3")
 ![4](/public/4.png "4")
-![4](/public/5.png "5")
-![4](/public/6.png "6")
 
 ## **特别鸣谢**
 
 
@@ -25,7 +25,7 @@
             <td>{{ $vo['remark'] }}</td>
             <td>
                 <a href="{{ route('edit-role',['id'=>$vo['id']]) }}" class="layui-btn layui-btn-xs layui-btn-normal  ajax-form" title="修改">修改</a>
-                <a href="{{ route('assign-permission',['id'=>$vo['id']]) }}" class="layui-btn layui-btn-xs layui-btn-normal  ajax-form" title="权限">权限</a>
+                <a href="{{ route('assign-permission',['id'=>$vo['id']]) }}" class="layui-btn layui-btn-xs layui-btn-normal" title="权限">权限</a>
                 <a href="{{ route('delete-role',['id'=>$vo['id']]) }}" title="删除" confirm="1" class="layui-btn layui-btn-xs layui-btn-danger  ajax-get">删除</a>
             </td>
         </tr>
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,11 @@ public function getNav()`
`41`	`41`	`redirect(route('/'));`
`42`	`42`	`}`
`43`	`43`	`//自己`
`44`		`- $self = Permission::where(['name' => Route::currentRouteName()])->first()->toArray();`
	`44`	`+ $self = Permission::where(['name' => Route::currentRouteName()])->first();`
	`45`	`+ if ($self) {`
	`46`	`+ $self = $self->toArray();`
	`47`	`+ }`
	`48`	`+`
`45`	`49`	`//当前用户含有权限的菜单`
`46`	`50`
`47`	`51`	`$rules = cache('sys:rule:' . $this->id);`
`@@ -73,14 +77,18 @@ public function getNav()`
`73`	`77`	`cache(['sys:menu:' . $this->id => $menu], env('APP_ENV') == 'local' ? 1 : 600);`
`74`	`78`	`}`
`75`	`79`	`//面包屑`
`76`		`- $crumb = Tree::getParents($rules, $self['id']);`
`77`		`- $parent_ids = [$self['id']];`
	`80`	`+ $crumb = Tree::getParents($rules, $self['id']);`
	`81`	`+`
	`82`	`+ $parent_ids = [];`
	`83`	`+ if ($self) {`
	`84`	`+ array_push($parent_ids, $self['id']);`
	`85`	`+ }`
	`86`	`+`
`78`	`87`	`if ($crumb) {`
`79`	`88`	`foreach ($crumb as $val) {`
`80`	`89`	`array_push($parent_ids, $val['id']);`
`81`	`90`	`}`
`82`	`91`	`}`
`83`		`-`
`84`	`92`	`return compact('self', 'menu', 'crumb', 'parent_ids');`
`85`	`93`	`}`
`86`	`94`	`}`