From 5a327e779a11792622f69e8b9806facadc7623bd Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 17 Mar 2023 16:26:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=85=B3=E8=81=94=E6=95=B0=E6=8D=AE=E9=9B=86=E4=B8=8D?=
 =?UTF-8?q?=E9=80=89=E5=AD=97=E6=AE=B5=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java        | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index dfe4da5860..c902bb2a75 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -1058,7 +1058,8 @@ public class DataSetTableService {
             Matcher matcher = pattern.matcher(sql);
             while (matcher.find()) {
                 SqlVariableDetails defaultsSqlVariableDetail = null;
-                List<SqlVariableDetails> defaultsSqlVariableDetails = new Gson().fromJson(sqlVariableDetails, new TypeToken<List<SqlVariableDetails>>() {}.getType());
+                List<SqlVariableDetails> defaultsSqlVariableDetails = new Gson().fromJson(sqlVariableDetails, new TypeToken<List<SqlVariableDetails>>() {
+                }.getType());
                 for (SqlVariableDetails sqlVariableDetail : defaultsSqlVariableDetails) {
                     if (matcher.group().substring(2, matcher.group().length() - 1).equalsIgnoreCase(sqlVariableDetail.getVariableName())) {
                         defaultsSqlVariableDetail = sqlVariableDetail;
@@ -1642,7 +1643,9 @@ public class DataSetTableService {
             // field
             StringBuilder field = new StringBuilder();
             for (Map.Entry<String, String[]> next : checkedInfo.entrySet()) {
-                field.append(StringUtils.join(next.getValue(), ",")).append(",");
+                if (next.getValue().length > 0) {
+                    field.append(StringUtils.join(next.getValue(), ",")).append(",");
+                }
             }
             String f = subPrefixSuffixChar(field.toString());
             // join
@@ -1790,7 +1793,9 @@ public class DataSetTableService {
             // field
             StringBuilder field = new StringBuilder();
             for (Map.Entry<String, String[]> next : checkedInfo.entrySet()) {
-                field.append(StringUtils.join(next.getValue(), ",")).append(",");
+                if (next.getValue().length > 0) {
+                    field.append(StringUtils.join(next.getValue(), ",")).append(",");
+                }
             }
             String f = subPrefixSuffixChar(field.toString());
             // join
@@ -2269,7 +2274,7 @@ public class DataSetTableService {
         }
         Set<String> nameSet = new HashSet<>();
         for (DataSetTableRequest table : datasetTable) {
-            if(StringUtils.isEmpty(table.getName())){
+            if (StringUtils.isEmpty(table.getName())) {
                 throw new RuntimeException(Translator.get("I18n_name_cant_empty"));
             }
             nameSet.add(table.getName());