From 9333ea6e9a7ff50059e50bb336c96d686fad5f4b Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 22 Feb 2022 15:11:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20API=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/datasource/DatasourceService.java | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
index ed92c08d74..f555be54c9 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -274,28 +274,29 @@ public class DatasourceService {
 
         List<LinkedHashMap> datas = JsonPath.read(response,apiDefinition.getDataPath());
         List<JSONObject> dataList = new ArrayList<>();
+        List<DatasetTableField> fields = new ArrayList<>();
+        Boolean getFileds = true;
+
         for (LinkedHashMap data : datas) {
             JSONObject jsonObject = new JSONObject();
             Iterator it = data.entrySet().iterator();
             while (it.hasNext()){
                 Map.Entry entry = (Map.Entry)it.next();
                 jsonObject.put((String) entry.getKey(), entry.getValue());
+                if(getFileds) {
+                    DatasetTableField tableField = new DatasetTableField();
+                    tableField.setOriginName((String) entry.getKey());
+                    tableField.setName((String) entry.getKey());
+                    tableField.setSize(65535);
+                    tableField.setDeExtractType(0);
+                    tableField.setDeType(0);
+                    tableField.setExtField(0);
+                    fields.add(tableField);
+                }
             }
+            getFileds = false;
             dataList.add(jsonObject);
         }
-        List<DatasetTableField> fields = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(dataList)){
-            for (Map.Entry<String, Object> stringObjectEntry : dataList.get(0).entrySet()) {
-                DatasetTableField tableField = new DatasetTableField();
-                tableField.setOriginName(stringObjectEntry.getKey());
-                tableField.setName(stringObjectEntry.getKey());
-                tableField.setSize(65535);
-                tableField.setDeExtractType(0);
-                tableField.setDeType(0);
-                tableField.setExtField(0);
-                fields.add(tableField);
-            }
-        }
         apiDefinition.setDatas(dataList);
         apiDefinition.setFields(fields);
         return apiDefinition;