工会后台修改

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']."管理员",

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 = [];

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'
         ];