From cbab16ddb408f380ca12d3a6da37c83ea03510b0 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 10 Oct 2020 18:13:39 +0800 Subject: [PATCH] 1 --- server/imserver/guild.cc | 3 +++ server/imserver/synchelper.cc | 1 + 2 files changed, 4 insertions(+) diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index b493992..5734d9a 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -325,6 +325,9 @@ void Guild::_CMGuildAgree(f8::MsgHdr& hdr, const cs::CMGuildAgree& msg) member = new GuildMember(); TypeConvert::Convert(msg.apply().base_data(), *member); AddMember(member); + member_job_hash_[member->account_id] = kGuildMember; + std::set* members = GetJobMembers(kGuildMember); + members->insert(member->account_id); SyncHelper::Instance()->SyncGuildMemberUpdate(this, member, kGuildUpdateReasonAgree); DBHelper::Instance()->SetGuildApplyStatus diff --git a/server/imserver/synchelper.cc b/server/imserver/synchelper.cc index 189ade9..93232df 100644 --- a/server/imserver/synchelper.cc +++ b/server/imserver/synchelper.cc @@ -104,6 +104,7 @@ void SyncHelper::SyncGuildMemberUpdate(Guild* guild, ss::SS_IM_GuildMemberUpdateRequest* notifymsg = new ss::SS_IM_GuildMemberUpdateRequest; notifymsg->set_seqid(App::Instance()->NewUUID()); notifymsg->set_guild_id(guild->GuildId()); + notifymsg->set_guild_job(guild->GetMemberJob(member->account_id)); notifymsg->set_sender_id(member->account_id); notifymsg->set_target_id(member->account_id); notifymsg->set_reason(reason);