fff

application/service/controller/History.php

@@ -384,11 +384,13 @@ class History extends Common
             // 获取用户ID.
             $accountId = input('get.account_id');
             $accountId_user = input('get.account_user_id');
+            $conversationId = intval(input('get.conversationId', 0));
+
 
             $chatLogField = ['*'];
             // 关联信息.
-            $chatLogWhere = "from_id='$accountId' and to_id='$accountId_user'";
-            $chatLogWhereOr = "from_id='$accountId_user' and to_id='$accountId'";
+            $chatLogWhere = "from_id='$accountId' and to_id='$accountId_user' and servicelog_id!=$conversationId ";
+            $chatLogWhereOr = "from_id='$accountId_user' and to_id='$accountId' and servicelog_id!=$conversationId ";
             // 分页.
             $currentPage = input('get.currentPage', '1');
             $pageSize = input('get.pageSize', '10');
@@ -401,7 +403,7 @@ class History extends Common
                 $offset,
                 $pageSize
             );
-         
+
             $countChatLog = model('ChatLog')->userChatLogCount($chatLogWhere, $chatLogWhereOr);
 
             $result['total'] = $countChatLog;