结果去重

bi-server/src/main/java/com/usoftchina/bi/server/service/dataSource/ColumnScreenService.java

@@ -15,6 +15,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class ColumnScreenService {
@@ -104,10 +105,11 @@ public class ColumnScreenService {
      * @return
      */
     public RepEntity getScreenByBaseIds(List<ColumnScreenInfo> columnScreenInfo){
-        List<Object> result = new ArrayList<>();
+        List<Object> dataList = new ArrayList<>();
         for (ColumnScreenInfo info : columnScreenInfo) {
-            result.addAll(getScreenByBaseId(info).getData());
+            dataList.addAll(getScreenByBaseId(info).getData());
         }
+        List<Object> result = dataList.stream().distinct().collect(Collectors.toList());
         if (result.size() > 20) {
             return new RepEntity(RepCode.success, result.subList(0, 20));
         }else {