diff --git a/server/imserver_new/guild/guildmgr.go b/server/imserver_new/guild/guildmgr.go index c8bab7a5..d2062489 100644 --- a/server/imserver_new/guild/guildmgr.go +++ b/server/imserver_new/guild/guildmgr.go @@ -321,9 +321,15 @@ func (this *guildMgr) asyncAcceptApplyTask(task *f5.AsyncTask, } func (this *guildMgr) AsyncAcceptApply(accountId string, targetId string, cb func(int32, string)) { + guild := this.internalGetGuildByAccountId(accountId) + if guild == nil { + cb(1, "") + return; + } f5.GetApp().AsyncLock([][]string{ {constant.MEMBER_LOCK_KEY, accountId}, {constant.MEMBER_LOCK_KEY, targetId}, + {constant.GUILD_LOCK_KEY, guild.guildId}, }, f5.NewAsyncTask( func (task *f5.AsyncTask) {