1
This commit is contained in:
parent
17ec97e887
commit
7c1b5c67a7
@ -369,6 +369,13 @@ void GuildMgr::__GuildDismiss(f8::JsonHttpRequest* request)
|
|||||||
request->resp_xobj->SetVal("errmsg", "");
|
request->resp_xobj->SetVal("errmsg", "");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
long long guild_id = request->request.At("guild_id")->AsXValue();
|
||||||
|
cs::MFGuildBasic* guild = GetGuildById(guild_id);
|
||||||
|
if (guild) {
|
||||||
|
guild->set__guild_status(kGuildDismissed);
|
||||||
|
}
|
||||||
|
request->resp_xobj->SetVal("errcode", 0);
|
||||||
|
request->resp_xobj->SetVal("errmsg", "");
|
||||||
}
|
}
|
||||||
|
|
||||||
void GuildMgr::__GuildUpdate(f8::JsonHttpRequest* request)
|
void GuildMgr::__GuildUpdate(f8::JsonHttpRequest* request)
|
||||||
@ -925,7 +932,9 @@ void GuildMgr::InternalSearch(const std::string& account_id,
|
|||||||
for (auto guild : commonrank->GetList()) {
|
for (auto guild : commonrank->GetList()) {
|
||||||
if (search_name.empty() ||
|
if (search_name.empty() ||
|
||||||
guild->guild_name().find(search_name) != std::string::npos) {
|
guild->guild_name().find(search_name) != std::string::npos) {
|
||||||
matched_list.push_back(guild);
|
if (guild->_guild_status() != kGuildDismissed) {
|
||||||
|
matched_list.push_back(guild);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
std::shuffle(matched_list.begin(), matched_list.end(), std::default_random_engine(rand()));
|
std::shuffle(matched_list.begin(), matched_list.end(), std::default_random_engine(rand()));
|
||||||
|
Loading…
x
Reference in New Issue
Block a user