From 96c22418978f9241b0b231df52fadcd65549b4f5 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 12 Apr 2024 19:25:39 +0800 Subject: [PATCH] 1 --- server/imserver_new/guild/guild.go | 7 ++++--- server/imserver_new/guild/guildmgr.go | 3 +-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server/imserver_new/guild/guild.go b/server/imserver_new/guild/guild.go index 346c1d72..06310c43 100644 --- a/server/imserver_new/guild/guild.go +++ b/server/imserver_new/guild/guild.go @@ -103,7 +103,7 @@ func (this *guild) updateByKv(kv map[int32]string) { } } -func (this *guild) disband() { +func (this *guild) disband(ownerId string, reason int32) { model.Guild.DeleteSoft(this.guildId, func (err error, lastInsertId int64, rowsAffected int64) { }) @@ -111,6 +111,7 @@ func (this *guild) disband() { func (err error, lastInsertId int64, rowsAffected int64) { }) _guildMgr.delGuild(this) + GetDbLogMgr().GuildDisband(this.guildId, ownerId, reason) } func (this *guild) AsyncFillMFGuild(pbGuild *cs.MFGuild, cb func(int32, string)) { @@ -173,14 +174,14 @@ func (this *guild) asyncLeave(accountId string, cb func(int32, string)) { }) } else { if this.GetMemberNum() <= 0 { - this.disband() + this.disband(accountId, 0) } cb(0, "") return } } else { if this.GetMemberNum() <= 0 { - this.disband() + this.disband(accountId, 0) } cb(0, "") } diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go index 6d24641a..99dbead5 100644 --- a/server/imserver_new/guild/guildmgr.go +++ b/server/imserver_new/guild/guildmgr.go @@ -604,8 +604,7 @@ func (this *guildMgr) AsyncDisband(accountId string, cb func(int32, string, []st cb(1, "Disband only leader perm", members) return } - guild.disband() - guild.disband() + guild.disband(accountId, 1) task.SetSucc() cb(0, "", members) })