From 384355f52c2de3d49d9bd27af33b5b284697c65a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= <leave1988@163.com>
Date: Mon, 24 Nov 2025 16:51:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=90=8E=E5=8F=B0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Activities.php        |  2 +-
 application/guildadmin/controller/Admin.php |  6 +++++-
 application/guildadmin/library/Auth.php     | 24 +++++++++++++++------
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/application/api/model/Activities.php b/application/api/model/Activities.php
index 64d37a8..129216d 100644
--- a/application/api/model/Activities.php
+++ b/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()
             ]);
diff --git a/application/guildadmin/controller/Admin.php b/application/guildadmin/controller/Admin.php
index 843039a..06f623d 100644
--- a/application/guildadmin/controller/Admin.php
+++ b/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());
-        $groupList = collection(AuthGroup::where('id', 'in', $this->childrenGroupIds)->where('guild_id', $this->guildId)->select())->toArray();
+        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()) {
diff --git a/application/guildadmin/library/Auth.php b/application/guildadmin/library/Auth.php
index 46839f1..bf7fea9 100644
--- a/application/guildadmin/library/Auth.php
+++ b/application/guildadmin/library/Auth.php
@@ -293,13 +293,23 @@ class Auth extends \fast\GuildaAuth
     {
         $uid = is_null($uid) ? $this->id : $uid;
 //        return parent::getGroups($uid);
-        $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'")
-            ->where('ag.guild_id', Session::get('guild_id'))
-            ->select();
+        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')
+                ->field('aga.uid,aga.group_id,ag.id,ag.pid,ag.name,ag.rules')
+                ->where("aga.uid='{$uid}' and ag.status='normal'")
+                ->where('ag.guild_id', Session::get('guild_id'))
+                ->select();
+        }
+
         $groups[$uid] = $user_groups ?: [];
         return $groups[$uid];
     }