From d434f50abcc5d16753da18c3e03cd917be4d6e29 Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@opencart.cn>
Date: Wed, 3 Aug 2022 16:18:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 beike/Admin/Repositories/PermissionRepo.php   | 19 +++++++++++++++++--
 beike/Admin/View/Components/Sidebar.php       |  4 ++--
 .../lang/{zh-CN => zh_cn}/admin/header.php    |  0
 3 files changed, 19 insertions(+), 4 deletions(-)
 rename resources/lang/{zh-CN => zh_cn}/admin/header.php (100%)

diff --git a/beike/Admin/Repositories/PermissionRepo.php b/beike/Admin/Repositories/PermissionRepo.php
index 369dbbb8..4ac4404d 100644
--- a/beike/Admin/Repositories/PermissionRepo.php
+++ b/beike/Admin/Repositories/PermissionRepo.php
@@ -17,8 +17,8 @@ use Spatie\Permission\Exceptions\PermissionDoesNotExist;
 
 class PermissionRepo
 {
-    private AdminUser $adminUser;
-    private Role $adminRole;
+    private ?AdminUser $adminUser = null;
+    private ?Role $adminRole = null;
 
     public function setUser(AdminUser $user): PermissionRepo
     {
@@ -44,7 +44,9 @@ class PermissionRepo
             ['title' => '商品管理', 'permissions' => $this->getProductPermissions()],
             ['title' => '客户管理', 'permissions' => $this->getCustomerPermissions()],
             ['title' => '系统设置', 'permissions' => $this->getSettingPermissions()],
+
             ['title' => '插件管理', 'permissions' => $this->getPluginPermissions()],
+            ['title' => '后台用户', 'permissions' => $this->getAdminUserPermissions()],
             ['title' => '区域分组', 'permissions' => $this->getRegionPermissions()],
             ['title' => '税率设置', 'permissions' => $this->getTaxRatePermissions()],
             ['title' => '税费类别', 'permissions' => $this->getTaxClassPermissions()],
@@ -121,6 +123,19 @@ class PermissionRepo
     }
 
 
+    /**
+     * 后台管理员权限列表
+     *
+     * @return mixed
+     */
+    private function getAdminUserPermissions()
+    {
+        $routes = ['admin_users_index', 'admin_users_create', 'admin_users_edit', 'admin_users_update', 'admin_users_delete'];
+        $items = $this->getPermissionList('user', $routes);
+        return hook_filter('role.user_permissions', $items);
+    }
+
+
     /**
      * 区域分组权限列表
      *
diff --git a/beike/Admin/View/Components/Sidebar.php b/beike/Admin/View/Components/Sidebar.php
index b5d4da8e..66e8ffbd 100644
--- a/beike/Admin/View/Components/Sidebar.php
+++ b/beike/Admin/View/Components/Sidebar.php
@@ -10,8 +10,8 @@ class Sidebar extends Component
 {
     public array $links = [];
     private string $adminName;
-    private string $routeNameWithPrefix;
-    private AdminUser $adminUser;
+    private ?string $routeNameWithPrefix;
+    private ?AdminUser $adminUser;
 
     /**
      * Create a new component instance.
diff --git a/resources/lang/zh-CN/admin/header.php b/resources/lang/zh_cn/admin/header.php
similarity index 100%
rename from resources/lang/zh-CN/admin/header.php
rename to resources/lang/zh_cn/admin/header.php