From 139952b110ffd94f68ad09cd260620d13044f7c8 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 11 Jun 2021 17:36:25 +0800
Subject: [PATCH] =?UTF-8?q?feat(fix):=E8=87=AA=E5=AE=9A=E4=B9=89=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E9=80=89=E6=8B=A9=E5=AD=97=E6=AE=B5=E9=A1=BA?=
 =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96=EF=BC=8C=E6=8C=89=E7=85=A7=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=82=B9=E5=87=BB=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableFieldsService.java   | 12 ++++++++++++
 .../service/dataset/DataSetTableService.java         |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java
index 8d1109780b..056bc1b03a 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableFieldsService.java
@@ -3,11 +3,13 @@ package io.dataease.service.dataset;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableFieldExample;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 
@@ -61,6 +63,16 @@ public class DataSetTableFieldsService {
         return datasetTableFieldMapper.selectByExample(datasetTableFieldExample);
     }
 
+    public List<DatasetTableField> getListByIdsEach(List<String> ids) {
+        List<DatasetTableField> list = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(ids)) {
+            ids.forEach(id -> {
+                list.add(datasetTableFieldMapper.selectByPrimaryKey(id));
+            });
+        }
+        return list;
+    }
+
     public List<DatasetTableField> getFieldsByTableId(String id) {
         DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample();
         datasetTableFieldExample.createCriteria().andTableIdEqualTo(id);
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 ab18067c74..583b1aeb55 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -477,7 +477,7 @@ public class DataSetTableService {
         Map<String, String[]> customInfo = new TreeMap<>();
         dataTableInfoDTO.getList().forEach(ele -> {
             String table = DorisTableUtils.dorisName(ele.getTableId());
-            List<DatasetTableField> fields = dataSetTableFieldsService.getListByIds(ele.getCheckedFields());
+            List<DatasetTableField> fields = dataSetTableFieldsService.getListByIdsEach(ele.getCheckedFields());
             String[] array = fields.stream().map(f -> table + "." + f.getDataeaseName() + " AS " + DorisTableUtils.dorisFieldName(ele.getTableId() + "_" + f.getDataeaseName())).toArray(String[]::new);
             customInfo.put(table, array);
         });