From d0203ecc8b939549d0bfa6fbd32840fd54b13448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Sat, 6 Dec 2025 11:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BC=9A=E5=90=8E=E5=8F=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/adminapi/controller/Guild.php   |  2 ++
 application/guildadmin/controller/Admin.php | 12 ++++++++++--
 application/guildadmin/model/Admin.php      |  2 +-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php
index 3d8862e..29b17ae 100644
--- a/application/adminapi/controller/Guild.php
+++ b/application/adminapi/controller/Guild.php
@@ -243,6 +243,7 @@ class Guild extends adminApi
                 //创建后台登录账号
                 $data = [
                     'guild_id' => $res,
+                    'guild_name' => $request['guild_name'],
                     'username' => $request['guild_user_mobile'],
                     'password' => $request['password'],
                     'nickname' => $request['guild_name']."管理员",
@@ -327,6 +328,7 @@ class Guild extends adminApi
                     //创建后台登录账号
                     $data = [
                         'guild_id' => $guild['id'],
+                        'guild_name' => $guild['guild_name'],
                         'username' => $request['guild_user_mobile'],
                         'password' => $request['password'],
                         'nickname' => $request['guild_name']."管理员",
diff --git a/application/guildadmin/controller/Admin.php b/application/guildadmin/controller/Admin.php
index b1b41c9..95dc29d 100644
--- a/application/guildadmin/controller/Admin.php
+++ b/application/guildadmin/controller/Admin.php
@@ -70,11 +70,19 @@ class Admin extends GuildAdmin
         $this->assignconfig("admin", ['id' => $this->auth->id]);
 
         $this->childrenGroupIds = $this->auth->getChildrenGroupIds(true);
-        $groupList = collection(AuthGroup::where('id', 'in', $this->childrenGroupIds)->where('guild_id', $this->guildId)->select())->toArray();
+        if($this->auth->id ==1){
+            $groupList = collection(AuthGroup::select())->toArray();
+        }else{
+            $groupList = collection(AuthGroup::where('id', 'in', $this->childrenGroupIds)->where('guild_id', $this->guildId)->select())->toArray();
+        }
         Tree::instance()->init($groupList);
         $groupList = [];
         if ($this->auth->isSuperAdmin()) {
-            $groupList = Tree::instance()->getTreeList(Tree::instance()->getTreeArray(1));
+            if($this->auth->id ==1){
+                $groupList = Tree::instance()->getTreeList(Tree::instance()->getTreeArray(0));
+            }else{
+                $groupList = Tree::instance()->getTreeList(Tree::instance()->getTreeArray(1));
+            }
         } else {
             $groups = $this->auth->getGroups();
             $groupIds = [];
diff --git a/application/guildadmin/model/Admin.php b/application/guildadmin/model/Admin.php
index 4043c6c..b1fc835 100644
--- a/application/guildadmin/model/Admin.php
+++ b/application/guildadmin/model/Admin.php
@@ -49,7 +49,7 @@ class Admin extends Model
         $group_data = [
             'guild_id' => $data['guild_id'],
             'pid' => 1,
-            'name' => '超级管理员',
+            'name' => "超级管理员({$data['guild_name']})",
             'rules' => '*',
             'status' => 'normal'
         ];