diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java
index 8c00cfb0..5a3143ac 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/java/com/cloud/kicc/commonbiz/controller/PushChatMessageController.java
@@ -60,7 +60,7 @@ public class PushChatMessageController {
         IPage<Map<String, Object>> result = iPushChatMessageService.listFriendHistoryMessage(page, pushChatMessage);
         String cursor = result.getRecords()
                 .stream()
-                .findFirst()
+                .reduce((first, second) -> second)
                 .map(record -> Objects.toString(record.get("createTime"), null))
                 .orElse(null);
         return R.ok(MapUtil.<String, Object>builder("cursor", cursor)
diff --git a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml
index ec123f1d..0caa0b42 100644
--- a/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-common-biz/src/main/resources/mapper/PushChatMessageMapper.xml
@@ -38,10 +38,12 @@
       <if test="ew.cursor != null and ew.cursor != ''">
         and pm.create_time &lt; #{ew.cursor}
       </if>
-      and (pm.user_id = #{ew.userId} and pm.alias = #{ew.alias})
-      or (pm.user_id = #{ew.alias} and pm.alias = #{ew.userId})
+      and (
+        (pm.user_id = #{ew.userId} and pm.alias = #{ew.alias})
+        or (pm.user_id = #{ew.alias} and pm.alias = #{ew.userId})
+      )
     </where>
-    order by pm.create_time asc
+    order by pm.create_time desc
   </select>
 
 </mapper>
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ChatGptController.java b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ChatGptController.java
index 21a42ead..fb0e91fe 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ChatGptController.java
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/java/com/cloud/kicc/system/controller/ChatGptController.java
@@ -44,7 +44,7 @@ public class ChatGptController {
 		IPage<Map<String, Object>> result = iImContentService.listHistoryMessage(page, imContent);
 		String cursor = result.getRecords()
 				.stream()
-				.findFirst()
+				.reduce((first, second) -> second)
 				.map(record -> Objects.toString(record.get("sendTime"), null))
 				.orElse(null);
 		return R.ok(MapUtil.<String, Object>builder("cursor", cursor)
diff --git a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ImContentMapper.xml b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ImContentMapper.xml
index dfec6628..967896a9 100644
--- a/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ImContentMapper.xml
+++ b/kicc-platform/kicc-platform-biz/kicc-system-biz/src/main/resources/mapper/ImContentMapper.xml
@@ -30,10 +30,12 @@
       <if test="ew.cursor != null and ew.cursor != ''">
         and im.send_time &lt; #{ew.cursor}
       </if>
-      and (im.send_user_id = #{ew.sendUserId} and im.receive_user_id = #{ew.receiveUserId})
-      or (im.send_user_id = #{ew.receiveUserId} and im.receive_user_id = #{ew.sendUserId})
+      and (
+        (im.send_user_id = #{ew.sendUserId} and im.receive_user_id = #{ew.receiveUserId})
+        or (im.send_user_id = #{ew.receiveUserId} and im.receive_user_id = #{ew.sendUserId})
+      )
     </where>
-    order by im.send_time asc
+    order by im.send_time desc
   </select>
 
 </mapper>