From 32a92bb0d0b6951fd27339c036b9f3462875324a Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 29 Sep 2020 15:04:12 +0800
Subject: [PATCH] 1

---
 server/imserver/guild.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc
index 9654d5e..29618ba 100644
--- a/server/imserver/guild.cc
+++ b/server/imserver/guild.cc
@@ -204,7 +204,7 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
     ss::SS_IM_ForwardGuildCMMsg *forward_msg = (ss::SS_IM_ForwardGuildCMMsg*)hdr.user_data;
 
     cs::SMGuildAgree respmsg;
-    GuildMember* member = GetMember(forward_msg->context().user_info().base_data().account_id());
+    GuildMember* member = GetMember(msg.apply().base_data().account_id());
     if (member) {
         SyncHelper::Instance()->SyncGuildMemberUpdate(this, member, kGuildUpdateReasonAgree);
         GuildMgr::Instance()->ForwardGuildSMMsg(hdr.socket_handle,
@@ -255,7 +255,7 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg)
                                             respmsg);
 
     member = new GuildMember();
-    TypeConvert::Convert(forward_msg->context().user_info().base_data(), *member);
+    TypeConvert::Convert(msg.apply().base_data(), *member);
     AddMember(member);
 
     SyncHelper::Instance()->SyncGuildMemberUpdate(this, member, kGuildUpdateReasonAgree);