From 8bb4307bf0bbcfb82837f23b9fa011084b302e6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=AE=B7=E5=8B=87?= <shyinyong@outlook.com>
Date: Thu, 7 Sep 2023 11:25:49 +0800
Subject: [PATCH] save

---
 server/imserver/guild.go    |  4 +---
 server/imserver/guildmgr.go | 10 ++++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/server/imserver/guild.go b/server/imserver/guild.go
index 123f56dd..314b4253 100644
--- a/server/imserver/guild.go
+++ b/server/imserver/guild.go
@@ -75,9 +75,7 @@ func (g *Guild) IsFull() bool {
 
 // AddMember 添加成员
 func (g *Guild) AddMember(member *GuildMember) {
-	if !g.IsFull() {
-		g.Members = append(g.Members, member)
-	}
+	g.Members = append(g.Members, member)
 }
 
 // RemoveMember 移除成员
diff --git a/server/imserver/guildmgr.go b/server/imserver/guildmgr.go
index a14f2bc0..cd713e3d 100644
--- a/server/imserver/guildmgr.go
+++ b/server/imserver/guildmgr.go
@@ -113,7 +113,6 @@ func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb fu
 		cb(ERR_CODE_GUILD_NO_EXISTS, "ApplyToGuild guild no exists")
 		return
 	}
-
 	// 是否加入其他公会
 	if !gm.CheckJoinGuild(applicantAccountId) {
 		cb(ERR_CODE_JOINED_GUILD, "ApplyToGuild joined guild")
@@ -124,7 +123,6 @@ func (gm *GuildMgr) ApplyToGuild(guildId int64, applicantAccountId string, cb fu
 		cb(ERR_CODE_GUILD_MEMBER_FULL, "ApplyToGuild guild member full")
 		return
 	}
-
 	// 可直接加入
 	if guild.JoinCond == JoinCondFree {
 		gm.JoinGuild(guild, applicantAccountId)
@@ -203,10 +201,6 @@ func (gm *GuildMgr) Approve(operatorAccountId, accountId string, cb func(errCode
 		return
 	}
 
-	if guild.IsFull() {
-		cb(ERR_CODE_GUILD_MEMBER_FULL, "Approve guild member full")
-		return
-	}
 	guildId := guild.GuildId
 	// 是否在申请队列中
 	pendingReqStatus := guild.GetPendingReqStatus(accountId)
@@ -215,6 +209,10 @@ func (gm *GuildMgr) Approve(operatorAccountId, accountId string, cb func(errCode
 		return
 	}
 
+	if guild.IsFull() {
+		cb(ERR_CODE_GUILD_MEMBER_FULL, "Approve guild member full")
+		return
+	}
 	newMember := &GuildMember{AccountId: accountId, Level: GuildMemberLevelDefault}
 	gm.upsertGuildMember(guildId, newMember, func(err error) {
 		if err != nil {