From f0c6445d06f4e0ec4a0fc5d94d68cbc0f2db38ec Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 17 Sep 2020 19:18:08 +0800
Subject: [PATCH] 1

---
 server/imserver/guild.h                | 1 +
 server/imserver/player.cc              | 4 ++--
 server/tools/protobuild/cs_proto.proto | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/server/imserver/guild.h b/server/imserver/guild.h
index c0d0ec3..6e3066b 100644
--- a/server/imserver/guild.h
+++ b/server/imserver/guild.h
@@ -81,5 +81,6 @@ private:
     bool dirty_ = false;
     timer_list* dirty_timer_ = nullptr;
     std::map<std::string, GuildMember*> member_hash_;
+    std::list<GuildMember*> sorted_members_;
     ss::MFGuildLogDB* logdb_ = nullptr;
 };
diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index 0e30162..45b96a6 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -978,9 +978,9 @@ void Player::FillApplyList(const cs::MFPaging& paging, cs::SMFriendApplyList& re
     }
     *respmsg.mutable_paging() = paging;
     if (paging.page_size() > 0) {
-        respmsg.mutable_paging()->set_total_page(ceil(i / paging.page_size()));
+        respmsg.mutable_paging()->set__total_page(ceil(i / paging.page_size()));
     } else {
-        respmsg.mutable_paging()->set_total_page(1);
+        respmsg.mutable_paging()->set__total_page(1);
     }
 }
 
diff --git a/server/tools/protobuild/cs_proto.proto b/server/tools/protobuild/cs_proto.proto
index 0b813f7..8c9fc32 100644
--- a/server/tools/protobuild/cs_proto.proto
+++ b/server/tools/protobuild/cs_proto.proto
@@ -26,7 +26,8 @@ message MFPaging
 {
     optional int64 curr_page = 1; //当前页（第一页是0）
     optional int32 page_size = 2; //每页记录数
-    optional int32 total_page = 3; //总页数（服务器填充该字段）
+    optional int32 _total_page = 3; //总页数（服务器填充该字段）
+    optional int32 _total_count = 4; //总记录数（服务器填充该字段）
 }
 
 //用户基础数据(可用于缓存，除下划线开头的字段会存储到db)