From c75233e37f2c442df2746a60ec87475550f7e583 Mon Sep 17 00:00:00 2001
From: QJ_wonder <38885395+BigdataQIJI@users.noreply.github.com>
Date: Sun, 27 Jul 2025 09:03:26 +0800
Subject: [PATCH] =?UTF-8?q?(fix)(chat)=20=E4=BF=AE=E5=A4=8D=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=97=A0=E6=B3=95=E8=B0=83?=
 =?UTF-8?q?=E7=94=A8/=E6=8F=92=E4=BB=B6=E7=BB=93=E6=9E=9C=E8=A2=ABNL2SQL?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#2277)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat/server/plugin/build/webservice/WebServiceQuery.java  | 4 ++--
 .../com/tencent/supersonic/chat/server/pojo/ParseContext.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java
index efefce08d..91e4a182a 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/plugin/build/webservice/WebServiceQuery.java
@@ -88,10 +88,10 @@ public class WebServiceQuery extends PluginSemanticQuery {
         restTemplate = ContextUtils.getBean(RestTemplate.class);
         try {
             responseEntity =
-                    restTemplate.exchange(requestUrl, HttpMethod.POST, entity, Object.class);
+                    restTemplate.exchange(requestUrl, HttpMethod.POST, entity, String.class);
             objectResponse = responseEntity.getBody();
             log.info("objectResponse:{}", objectResponse);
-            Map<String, Object> response = JsonUtil.objectToMap(objectResponse);
+            Map<String, Object> response = JSON.parseObject(objectResponse.toString());
             webServiceResponse.setResult(response);
         } catch (Exception e) {
             log.info("Exception:{}", e.getMessage());
diff --git a/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java b/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java
index 5e97c83d2..d7e11d0e4 100644
--- a/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java
+++ b/chat/server/src/main/java/com/tencent/supersonic/chat/server/pojo/ParseContext.java
@@ -19,7 +19,7 @@ public class ParseContext {
     }
 
     public boolean enableNL2SQL() {
-        return Objects.nonNull(agent) && agent.containsDatasetTool();
+        return Objects.nonNull(agent) && agent.containsDatasetTool()&&response.getSelectedParses().size() == 0;
     }
 
     public boolean enableLLM() {