公会后台登录修改

application/api/model/Activities.php

@@ -239,7 +239,7 @@ class Activities extends Model
             // 添加活动记录
             $reslut = Db::name('vs_activities_receive')->insert([
                 'user_id' => $user_id,
-                'activities_id' => 1,
+                'activities_id' => 7,
                 'createtime' => time(),
                 'updatetime' => time()
             ]);

application/guildadmin/controller/Admin.php

@@ -43,7 +43,11 @@ class Admin extends GuildAdmin
         $this->guildId = Session::get('guild_id');
         $this->childrenAdminIds = $this->auth->getChildrenAdminIds($this->auth->isSuperAdmin());
         $this->childrenGroupIds = $this->auth->getChildrenGroupIds($this->auth->isSuperAdmin());
+        if($this->auth->id ==1){
+            $groupList = collection(AuthGroup::where('id', 'in', $this->childrenGroupIds)->select())->toArray();
+        }else{
             $groupList = collection(AuthGroup::where('id', 'in', $this->childrenGroupIds)->where('guild_id', $this->guildId)->select())->toArray();
+        }
         Tree::instance()->init($groupList);
         $groupdata = [];
         if ($this->auth->isSuperAdmin()) {

application/guildadmin/library/Auth.php

@@ -293,6 +293,14 @@ class Auth extends \fast\GuildaAuth
     {
         $uid = is_null($uid) ? $this->id : $uid;
 //        return parent::getGroups($uid);
+        if($uid == 1){
+            $user_groups = Db::name('vs_guild_admin_auth_group_access')
+                ->alias('aga')
+                ->join('fa_vs_guild_admin_auth_group ag', 'aga.group_id = ag.id', 'LEFT')
+                ->field('aga.uid,aga.group_id,ag.id,ag.pid,ag.name,ag.rules')
+                ->where("aga.uid='{$uid}' and ag.status='normal'")
+                ->select();
+        }else{
             $user_groups = Db::name('vs_guild_admin_auth_group_access')
                 ->alias('aga')
                 ->join('fa_vs_guild_admin_auth_group ag', 'aga.group_id = ag.id', 'LEFT')
@@ -300,6 +308,8 @@ class Auth extends \fast\GuildaAuth
                 ->where("aga.uid='{$uid}' and ag.status='normal'")
                 ->where('ag.guild_id', Session::get('guild_id'))
                 ->select();
+        }
+
         $groups[$uid] = $user_groups ?: [];
         return $groups[$uid];
     }