diff --git a/server/imserver/guild.cc b/server/imserver/guild.cc index 1a2e50a..53abd34 100644 --- a/server/imserver/guild.cc +++ b/server/imserver/guild.cc @@ -295,18 +295,18 @@ void Guild::_CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg) std::vector sql_params; { sql_params.push_back(a8::XValue(last_apply_idx_)); - sql_params.push_back(a8::XValue(forward_msg->context().user_info().base_data().account_id())); + sql_params.push_back(a8::XValue(guild_id)); } DBEngine::Instance()->ExecAsyncQuery ( conn_info, ( - "SELECT A.idx, A.applyid, A.target_id, A.sender_id, A.sender_nickname, " + "SELECT A.idx, A.applyid, A.guild_id, A.sender_id, A.sender_nickname, " " A.sender_avatar_url, A.sender_sex, A.sender_data_version1, " " A.sender_user_value1, A.sender_user_value2, A.sender_user_value3, A.status " "FROM guild_apply A " " LEFT JOIN (" + fmtstr + ") AS B ON B.account_id = A.sender_id " - "WHERE A.idx > %d AND A.target_id='%s' AND A.status=0 AND " + "WHERE A.idx > %d AND A.guild_id='%s' AND A.status=0 AND " " B.account_id IS NULL;" ).c_str(), sql_params,