From 1ae4e172627039abdb73b4a2793b8c5cc6356a14 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 29 Sep 2020 14:05:24 +0800
Subject: [PATCH] 1

---
 server/imserver/handlermgr.cc |  1 +
 server/imserver/player.cc     | 12 ++++++++++++
 server/imserver/player.h      |  1 +
 3 files changed, 14 insertions(+)

diff --git a/server/imserver/handlermgr.cc b/server/imserver/handlermgr.cc
index 1317227..0294936 100644
--- a/server/imserver/handlermgr.cc
+++ b/server/imserver/handlermgr.cc
@@ -114,6 +114,7 @@ void HandlerMgr::RegisterNetMsgHandlers()
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildSearch);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildRank);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberList);
+    RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildApplyList);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildLog);
     RegisterNetMsgHandler(&wsmsghandler, &Player::_CMGuildMemberSetJob);
 
diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 99a0f4f..2870fc8 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -925,6 +925,18 @@ void Player::_CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg)
     ForwardGuildCMMsg(hdr, GuildId());
 }
 
+void Player::_CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg)
+{
+    cs::SMGuildApplyList respmsg;
+    if (GuildId() == 0) {
+        respmsg.set_errcode(1);
+        respmsg.set_errmsg("你还没有公会");
+        SendMsg(respmsg);
+        return;
+    }
+    ForwardGuildCMMsg(hdr, GuildId());
+}
+
 void Player::_CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg)
 {
     cs::SMGuildMemberSetJob respmsg;
diff --git a/server/imserver/player.h b/server/imserver/player.h
index 0912e79..746c5e2 100644
--- a/server/imserver/player.h
+++ b/server/imserver/player.h
@@ -106,6 +106,7 @@ class Player
     void _CMGuildSearch(f8::MsgHdr& hdr, const cs::CMGuildSearch& msg);
     void _CMGuildRank(f8::MsgHdr& hdr, const cs::CMGuildRank& msg);
     void _CMGuildMemberList(f8::MsgHdr& hdr, const cs::CMGuildMemberList& msg);
+    void _CMGuildApplyList(f8::MsgHdr& hdr, const cs::CMGuildApplyList& msg);
     void _CMGuildLog(f8::MsgHdr& hdr, const cs::CMGuildLog& msg);
     void _CMGuildMemberSetJob(f8::MsgHdr& hdr, const cs::CMGuildMemberSetJob& msg);