github/dataease
github/dataease
3
0
Fork 1
mirror of https://github.com/dataease/dataease.git synced 2025-02-25 20:42:55 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge pull request #4807 from dataease/pr@dev@fix_union

Browse Source 
fix(数据集): 修复关联数据集不选字段报错的问题
This commit is contained in:
Junjun 2023-03-17 16:31:52 +08:00 committed by GitHub
commit 7729bf63d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
View File

@ -1058,7 +1058,8 @@ public class DataSetTableService {
Matcher matcher = pattern.matcher(sql); Matcher matcher = pattern.matcher(sql);
while (matcher.find()) { while (matcher.find()) {
SqlVariableDetails defaultsSqlVariableDetail = null; 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) { for (SqlVariableDetails sqlVariableDetail : defaultsSqlVariableDetails) {
if (matcher.group().substring(2, matcher.group().length() - 1).equalsIgnoreCase(sqlVariableDetail.getVariableName())) { if (matcher.group().substring(2, matcher.group().length() - 1).equalsIgnoreCase(sqlVariableDetail.getVariableName())) {
defaultsSqlVariableDetail = sqlVariableDetail; defaultsSqlVariableDetail = sqlVariableDetail;
@ -1642,8 +1643,10 @@ public class DataSetTableService {
// field // field
StringBuilder field = new StringBuilder(); StringBuilder field = new StringBuilder();
for (Map.Entry<String, String[]> next : checkedInfo.entrySet()) { for (Map.Entry<String, String[]> next : checkedInfo.entrySet()) {
if (next.getValue().length > 0) {
field.append(StringUtils.join(next.getValue(), ",")).append(","); field.append(StringUtils.join(next.getValue(), ",")).append(",");
} }
}
String f = subPrefixSuffixChar(field.toString()); String f = subPrefixSuffixChar(field.toString());
// join // join
StringBuilder join = new StringBuilder(); StringBuilder join = new StringBuilder();
@ -1790,8 +1793,10 @@ public class DataSetTableService {
// field // field
StringBuilder field = new StringBuilder(); StringBuilder field = new StringBuilder();
for (Map.Entry<String, String[]> next : checkedInfo.entrySet()) { for (Map.Entry<String, String[]> next : checkedInfo.entrySet()) {
if (next.getValue().length > 0) {
field.append(StringUtils.join(next.getValue(), ",")).append(","); field.append(StringUtils.join(next.getValue(), ",")).append(",");
} }
}
String f = subPrefixSuffixChar(field.toString()); String f = subPrefixSuffixChar(field.toString());
// join // join
StringBuilder join = new StringBuilder(); StringBuilder join = new StringBuilder();
@ -2269,7 +2274,7 @@ public class DataSetTableService {
} }
Set<String> nameSet = new HashSet<>(); Set<String> nameSet = new HashSet<>();
for (DataSetTableRequest table : datasetTable) { for (DataSetTableRequest table : datasetTable) {
if(StringUtils.isEmpty(table.getName())){ if (StringUtils.isEmpty(table.getName())) {
throw new RuntimeException(Translator.get("I18n_name_cant_empty")); throw new RuntimeException(Translator.get("I18n_name_cant_empty"));
} }
nameSet.add(table.getName()); nameSet.add(table.getName());