diff --git a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java
index 7309437f4..59d1524ef 100644
--- a/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java
+++ b/chat/core/src/main/java/com/tencent/supersonic/chat/service/impl/ChatServiceImpl.java
@@ -183,7 +183,7 @@ public class ChatServiceImpl implements ChatService {
                 .collect(Collectors.groupingBy(ChatParseDO::getQuestionId));
         for (QueryResp queryResp : queryResps) {
             List<ChatParseDO> chatParseDOList = chatParseMap.get(queryResp.getQuestionId());
-            if (CollectionUtils.isEmpty(chatParseMap)) {
+            if (CollectionUtils.isEmpty(chatParseDOList)) {
                 continue;
             }
             List<SemanticParseInfo> parseInfos = chatParseDOList.stream().map(chatParseDO ->
diff --git a/chat/core/src/main/resources/mapper/custom/ShowCaseCustomMapper.xml b/chat/core/src/main/resources/mapper/custom/ShowCaseCustomMapper.xml
index e5ea2e18a..416338aa2 100644
--- a/chat/core/src/main/resources/mapper/custom/ShowCaseCustomMapper.xml
+++ b/chat/core/src/main/resources/mapper/custom/ShowCaseCustomMapper.xml
@@ -56,18 +56,21 @@
     <select id="queryShowCase" resultMap="ResultMapWithBLOBs">
         select q1.*
         from s2_chat_query q1
-                 join (
+        join (
             select distinct chat_id
-            from s2_chat_query
-            where query_state = 1 and agent_id = ${agentId} and (score is null or score > 1)
-        <if test="userName != null and userName != ''">
-                  and user_name = #{userName}
-            </if>
-            order by chat_id desc
-                limit #{start}, #{limit}
-        ) q2
-                      on q1.chat_id = q2.chat_id
-        where agent_id = ${agentId}
+            from (
+               select *
+               from s2_chat_query
+               where query_state = 1 and agent_id = ${agentId}
+               <if test="userName != null and userName != ''">
+                     and user_name = #{userName}
+               </if>
+               order by score, chat_id desc
+            )
+            limit #{start}, #{limit}
+        ) q2 on q1.chat_id = q2.chat_id
+        where agent_id = ${agentId} and (score is null or score > 1)
+        order by score desc
     </select>
 
 </mapper>