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

fix: API 数据集同步错误

Browse Source
This commit is contained in:
taojinlong 2022-02-23 17:43:28 +08:00
parent b1100a01e4
commit 85012cb42e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/dataease/provider/datasource/ApiProvider.java
View File

@ -185,7 +185,7 @@ public class ApiProvider extends DatasourceProvider{
int i = 0; int i = 0;
while (it.hasNext()){ while (it.hasNext()){
Map.Entry entry = (Map.Entry)it.next(); Map.Entry entry = (Map.Entry)it.next();
row[i] = Optional.ofNullable(entry.getValue()).orElse("").toString(); row[i] = Optional.ofNullable(entry.getValue()).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " ");
i++; i++;
} }
dataList.add(row); dataList.add(row);

2
backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
View File

@ -310,7 +310,7 @@ public class DatasourceService {
Iterator it = data.entrySet().iterator(); Iterator it = data.entrySet().iterator();
while (it.hasNext()){ while (it.hasNext()){
Map.Entry entry = (Map.Entry)it.next(); Map.Entry entry = (Map.Entry)it.next();
jsonObject.put((String) entry.getKey(), entry.getValue()); jsonObject.put((String) entry.getKey(), Optional.ofNullable(entry.getValue()).orElse("").toString().replaceAll("\n", " ").replaceAll("\r", " "));
if(getFileds) { if(getFileds) {
DatasetTableField tableField = new DatasetTableField(); DatasetTableField tableField = new DatasetTableField();
tableField.setOriginName((String) entry.getKey()); tableField.setOriginName((String) entry.getKey());