diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc
index 903ba84..e1b07d5 100644
--- a/server/rankserver/guildmgr.cc
+++ b/server/rankserver/guildmgr.cc
@@ -166,11 +166,13 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
         delete guild;
         return;
     }
+    long long name_ext1 = GetNameExt1(guild->_channel());
+    long long name_ext2 = 0;
     if (GetGuildByName(
                        guild->_gameid(),
                        guild->_channel(),
-                       guild->_name_ext1(),
-                       guild->_name_ext2(),
+                       name_ext1,
+                       name_ext2,
                        guild->guild_name()
                        )) {
         request->resp_xobj->SetVal("errcode", 3);
@@ -210,11 +212,6 @@ void GuildMgr::__GuildCreate(f8::JsonHttpRequest* request)
     guild->set_member_num(1);
     guild->set__createtime(App::Instance()->nowtime);
     guild->set__modifytime(App::Instance()->nowtime);
-    long long name_ext1 = GetNameExt1(guild->_channel());
-    long long name_ext2 = 0;
-    if (f8::Channel_e::DOUYIN == guild->_channel()) {
-        name_ext1 = f8::Channel_e::DOUYIN;
-    }
     std::string guild_name_base64;
     a8::openssl::Base64Encode(guild->guild_name(), guild_name_base64);
     DBEngine::Instance()->ExecAsyncScript
@@ -937,6 +934,7 @@ void GuildMgr::InternalSearch(const std::string& account_id,
     total_page = 0;
     total_count = 0;
     int gameid = f8::ExtractGameIdFromAccountId(account_id);
+    int channel = f8::ExtractChannelIdFromAccountId(account_id);
     a8::CommonRank<cs::MFGuildBasic>* commonrank = GetGuildList(gameid);
     if (!commonrank || commonrank->GetList().empty()) {
         return;
@@ -955,6 +953,9 @@ void GuildMgr::InternalSearch(const std::string& account_id,
         if (guild_list->Size() >= page_size) {
             break;
         }
+        if (guild->_channel() != channel) {
+            continue;
+        }
         a8::MutableXObject* guild_xobj = a8::MutableXObject::NewObject();
         TypeConvert::Convert(guild, guild_xobj);
         if (applyed_guilds.find(guild->guild_id()) != applyed_guilds.end()) {