From 3193a788be97f9aece51fc7c184f70386bad8d37 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Wed, 17 Jun 2020 17:02:26 +0800
Subject: [PATCH] 1

---
 server/imserver/player.cc                         | 8 ++++++--
 server/tools/robot/virtualclient/virtualclient.py | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/server/imserver/player.cc b/server/imserver/player.cc
index f18b43e..531a7fb 100644
--- a/server/imserver/player.cc
+++ b/server/imserver/player.cc
@@ -221,7 +221,7 @@ void Player::_CMFriendApplyList(f8::MsgHdr& hdr, const cs::CMFriendApplyList& ms
     cs::MFPaging* paging_copy = new cs::MFPaging;
     *paging_copy = msg.paging();
     a8::XObject conn_info = DBEngine::Instance()->GetConnInfo(myself.crc32_code);
-    DBEngine::Instance()->ExecAsyncScript
+    DBEngine::Instance()->ExecAsyncQuery
         (
          conn_info,
          "SELECT idx, applyid, target_id, sender_id, sender_nickname, "
@@ -527,7 +527,11 @@ void Player::FillApplyList(const cs::MFPaging& paging, cs::SMFriendApplyList& re
         ++i;
     }
     *respmsg.mutable_paging() = paging;
-    respmsg.mutable_paging()->set_total_page(ceil(i / paging.page_size()));
+    if (paging.page_size() > 0) {
+        respmsg.mutable_paging()->set_total_page(ceil(i / paging.page_size()));
+    } else {
+        respmsg.mutable_paging()->set_total_page(1);
+    }
 }
 
 void Player::SyncLocToMasterServer()
diff --git a/server/tools/robot/virtualclient/virtualclient.py b/server/tools/robot/virtualclient/virtualclient.py
index e028fc7..3ad17ca 100644
--- a/server/tools/robot/virtualclient/virtualclient.py
+++ b/server/tools/robot/virtualclient/virtualclient.py
@@ -73,7 +73,7 @@ class VirtualClient(object):
 
     def sendFriendApply(self, conn):
         msg = cs_proto_pb2.CMFriendApply()
-        msg.friend_id = '123'
+        msg.friend_id = 'test0'
         msg.msg = 'hello'
         self.sendMsg(conn, msg)