diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CaseAiConversationsDao.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CaseAiConversationsDao.java
index 86305ffd..444a7545 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CaseAiConversationsDao.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/dao/CaseAiConversationsDao.java
@@ -18,7 +18,7 @@ public class CaseAiConversationsDao extends BaseDao<CaseAiConversations> {
      */
     public String findAiConversationIdById(String conversationId) {
         CaseAiConversations conversation = this.getGenericDao().findOne(CaseAiConversations.class, 
-            FieldFilters.eq("id", conversationId));
-        return conversation != null ? conversation.getAiConversationId() : null;
+            FieldFilters.eq("ai_conversation_id", conversationId));
+        return conversation != null ? conversation.getAiConversationId() : conversationId;
     }
 }
\ No newline at end of file