center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: 去除重名变量

Browse Source
This commit is contained in:
taojinlong 2022-08-29 11:44:40 +08:00
parent 7edebc36cd
commit a28ab4e81a
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -946,13 +946,20 @@ public class DataSetTableService {
if (CollectionUtils.isEmpty(datasetTables)) { if (CollectionUtils.isEmpty(datasetTables)) {
return new ArrayList<>(); return new ArrayList<>();
} }
List<SqlVariableDetails> sqlVariableDetails = new ArrayList<>(); List<SqlVariableDetails> sqlVariableDetails = new ArrayList<>();
List<String> sqlVariableNames = new ArrayList<>();
datasetTables.forEach(datasetTable -> { datasetTables.forEach(datasetTable -> {
if (StringUtils.isNotEmpty(datasetTable.getSqlVariableDetails())) { if (StringUtils.isNotEmpty(datasetTable.getSqlVariableDetails())) {
sqlVariableDetails.addAll(new Gson().fromJson(datasetTable.getSqlVariableDetails(), new TypeToken<List<SqlVariableDetails>>() { List<SqlVariableDetails> sqlVariables = new Gson().fromJson(datasetTable.getSqlVariableDetails(), new TypeToken<List<SqlVariableDetails>>() {}.getType());
}.getType())); for (SqlVariableDetails sqlVariable : sqlVariables) {
if(!sqlVariableNames.contains(sqlVariable.getVariableName())){
sqlVariableNames.add(sqlVariable.getVariableName());
sqlVariableDetails.add(sqlVariable);
}
}
} }
}); });
return sqlVariableDetails; return sqlVariableDetails;
} }