Merge branch 'feature-refactor' of ssh://10.10.100.21/source/platform-bi-server into feature-refactor

bi-server/src/main/java/com/usoftchina/bi/server/service/chart/ShowLineService.java

@@ -70,7 +70,7 @@ public class ShowLineService {
         int id = lineConfigInfo.getId();
         int baseId = getChartsDataUtilService.getBaseId(id);
         ChartsColumnConfig chartsColumn = chartsConfigMapper.getChartsColumn(id);
-        String tableName = chartsUtilService.getSqlStr(token, id, dashId);
+        String tableName = chartsUtilService.getSqlStr(token, id, dashId) + " emp ";
         /* 参数校验 */
         if (ObjectUtils.isEmpty(chartsColumn)){
             return new RepEntity(RepCode.Null);
@@ -196,7 +196,7 @@ public class ShowLineService {
                     value = histogramGroupDataList.stream().map(HistogramGroupData::getValue).collect(Collectors.toList()).subList(0, xAxisData.size());
                     Series series = new Series(key, value, groupBy.get(0));
                     serieses.add(series);
-                }while (it.hasNext() && i <= xAxisData.size());
+                }while (it.hasNext() && i <= (xAxisData.size() > groupList.size()?xAxisData.size():groupList.size()));
             }
             chartsDataInfo.setStyleConfig(styleConfig);
             chartsDataInfo.setChartsColumnConfig(chartsColumn);