From db97119704b38210f80006861728341e9be53b9a Mon Sep 17 00:00:00 2001
From: walkor <walkor@workerman.net>
Date: Thu, 22 Dec 2022 14:41:07 +0800
Subject: [PATCH] save

---
 .../admin/app/controller/AccountController.php      |  4 ++--
 src/plugin/admin/app/controller/Crud.php            | 12 +++++-------
 src/plugin/admin/app/controller/RoleController.php  | 13 ++++++++++++-
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/plugin/admin/app/controller/AccountController.php b/src/plugin/admin/app/controller/AccountController.php
index 9e20803..3b9e698 100644
--- a/src/plugin/admin/app/controller/AccountController.php
+++ b/src/plugin/admin/app/controller/AccountController.php
@@ -2,6 +2,7 @@
 
 namespace plugin\admin\app\controller;
 
+use plugin\admin\app\common\Auth;
 use plugin\admin\app\common\Util;
 use plugin\admin\app\model\Admin;
 use support\exception\BusinessException;
@@ -107,14 +108,13 @@ class AccountController extends Crud
         }
         $info = [
             'nickname' => $admin['nickname'],
-            'desc' => 'manager',
             'avatar' => $admin['avatar'],
             'token' => $request->sessionId(),
             'userId' => $admin['id'],
             'username' => $admin['username'],
             'email' => $admin['email'],
             'mobile' => $admin['mobile'],
-            'roles' => []
+            'isSupperAdmin' => Auth::isSupperAdmin()
         ];
         return $this->json(0, 'ok', $info);
     }
diff --git a/src/plugin/admin/app/controller/Crud.php b/src/plugin/admin/app/controller/Crud.php
index 3f3d6fc..81c8f6b 100644
--- a/src/plugin/admin/app/controller/Crud.php
+++ b/src/plugin/admin/app/controller/Crud.php
@@ -336,23 +336,21 @@ class Crud extends Base
     /**
      * 格式化树
      * @param $items
-     * @param array $include
-     * @param int $type
      * @return Response
      */
-    protected function formatTree($items, array $include = [], int $type = 0): Response
+    protected function formatTree($items): Response
     {
-        $items_map = [];
+        $format_items = [];
         foreach ($items as $item) {
-            $items_map[] = [
+            $format_items[] = [
                 'name' => $item->title ?? $item->name ?? $item->id,
                 'value' => (string)$item->id,
                 'id' => $item->id,
                 'pid' => $item->pid,
             ];
         }
-        $tree = new Tree($items_map);
-        return  $this->json(0, 'ok', $tree->getTree($include, $type));
+        $tree = new Tree($format_items);
+        return $this->json(0, 'ok', $tree->getTree());
     }
 
     /**
diff --git a/src/plugin/admin/app/controller/RoleController.php b/src/plugin/admin/app/controller/RoleController.php
index fb8f508..431f983 100644
--- a/src/plugin/admin/app/controller/RoleController.php
+++ b/src/plugin/admin/app/controller/RoleController.php
@@ -166,7 +166,18 @@ class RoleController extends Crud
         if ($rule_id_string !== '*') {
             $include = explode(',', $rule_id_string);
         }
-        return $this->formatTree($rules, $include);
+        $items = [];
+        foreach ($rules as $item) {
+            $items[] = [
+                'name' => $item->title ?? $item->name ?? $item->id,
+                'value' => (string)$item->id,
+                'id' => $item->id,
+                'pid' => $item->pid,
+            ];
+        }
+        $tree = new Tree($items);
+        return $this->json(0, 'ok', $tree->getTree($include));
     }
 
+
 }