diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
index 7a75eb6655..463019f503 100644
--- a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
@@ -481,8 +481,9 @@ public class SqlparserUtils {
         if (StringUtils.isEmpty(sql)) {
             DEException.throwException(Translator.get("i18n_sql_not_empty"));
         }
-        if (sql.trim().endsWith(";")) {
-            sql = sql.trim().substring(0, sql.length() - 1);
+        sql = sql.trim();
+        if (sql.endsWith(";")) {
+            sql = sql.substring(0, sql.length() - 1);
         }
 
         if (StringUtils.isNotEmpty(sqlVariableDetails)) {
diff --git a/core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java b/core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java
index eb2249e805..958547586f 100644
--- a/core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java
+++ b/core/core-backend/src/main/java/io/dataease/copilot/manage/CopilotManage.java
@@ -450,8 +450,9 @@ public class CopilotManage {
     public String transSql(String type, String copilotSQL, Provider provider, ReceiveDTO receiveDTO) {
         if (type.equals("oracle") || type.equals("sqlServer")) {
             try {
-                if (copilotSQL.trim().endsWith(";")) {
-                    copilotSQL = copilotSQL.trim().substring(0, copilotSQL.length() - 1);
+                copilotSQL = copilotSQL.trim();
+                if (copilotSQL.endsWith(";")) {
+                    copilotSQL = copilotSQL.substring(0, copilotSQL.length() - 1);
                 }
                 DatasourceSchemaDTO datasourceSchemaDTO = new DatasourceSchemaDTO();
                 datasourceSchemaDTO.setType(type);
diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java b/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java
index 16a33ae44c..e7749dd092 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/utils/SqlUtils.java
@@ -20,8 +20,9 @@ public class SqlUtils {
     public static Logger logger = LoggerFactory.getLogger(SqlUtils.class);
 
     public static String addSchema(String sql, String schema) {
-        if (sql.trim().endsWith(";")) {
-            sql = sql.trim().substring(0, sql.length() - 1);
+        sql = sql.trim();
+        if (sql.endsWith(";")) {
+            sql = sql.substring(0, sql.length() - 1);
         }
 
         SqlParser.Config config =