From 17ec97e887f7be1f0c592225f8b2744217917248 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 28 Nov 2022 15:28:17 +0800
Subject: [PATCH] 1

---
 server/imserver/guildmgr.cc   | 7 +++----
 server/rankserver/constant.h  | 7 +++++++
 server/rankserver/guildmgr.cc | 4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/server/imserver/guildmgr.cc b/server/imserver/guildmgr.cc
index c6b363f..6ba7e4c 100644
--- a/server/imserver/guildmgr.cc
+++ b/server/imserver/guildmgr.cc
@@ -49,7 +49,7 @@ public:
             hdr.user_data = &forward_msg;
             if (guild->Status() == kGuildDismissed) {
                 cs::SMShowErrorMsg notifymsg;
-                notifymsg.set_msg(TEXT("guild_dismissed", "dismissed"));
+                notifymsg.set_msg(TEXT("guild_dismissed", "force dismissed"));
                 GuildMgr::Instance()->ForwardGuildSMMsg(socket_handle,
                                                         forward_msg.context(),
                                                         notifymsg);
@@ -287,10 +287,9 @@ void GuildMgr::LoadGuild(long long guild_id)
          "  join_unlimited, join_cond1, join_cond2, createtime, channel, "
          "  owner_vip_lv, owner_head, creator_vip_lv, creator_head, "
          "  owner_sex, creator_sex "
-         "FROM `guild` WHERE guild_id=%d AND guild_status <> %d;",
+         "FROM `guild` WHERE guild_id=%d;",
          {
-             guild_id,
-                 kGuildDismissed
+             guild_id
          },
          a8::XParams()
          .SetSender(guild_id),
diff --git a/server/rankserver/constant.h b/server/rankserver/constant.h
index b04c98d..b55b42d 100755
--- a/server/rankserver/constant.h
+++ b/server/rankserver/constant.h
@@ -13,6 +13,13 @@ enum InnerMesssage_e
     IM_HttpResponse,
 };
 
+enum GuildStatus_e
+{
+    kGuildCreatePending = 0,
+    kGuildCreated = 1,
+    kGuildDismissed = 2
+};
+
 //网络处理对象
 enum NetHandler_e
 {
diff --git a/server/rankserver/guildmgr.cc b/server/rankserver/guildmgr.cc
index 7c88d9b..7a58949 100644
--- a/server/rankserver/guildmgr.cc
+++ b/server/rankserver/guildmgr.cc
@@ -800,7 +800,7 @@ void GuildMgr::UpdateRank(cs::MFGuildBasic* guild)
              guild->_gameid(),
              rank_cmp_func_,
              MAX_RANK_LIST_NUM);
-        if (guild->_guild_status() == 2 ||
+        if (guild->_guild_status() == kGuildDismissed ||
             guild->member_num() <= 0) {
             rank_list->Remove(guild);
         } else {
@@ -814,7 +814,7 @@ void GuildMgr::UpdateRank(cs::MFGuildBasic* guild)
              guild->_gameid(),
              sorted_cmp_func_,
              MAX_SORTED_LIST_NUM);
-        if (guild->_guild_status() == 2 ||
+        if (guild->_guild_status() == kGuildDismissed ||
             guild->member_num() <= 0) {
             rank_list->Remove(guild);
         } else {