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/ShowIndividualService.java

@@ -49,7 +49,8 @@ public class ShowIndividualService {
         List<LinkedHashMap<String, Object>> targetValue = new ArrayList<>();
         int id = individualConfigInfo.getId();
         ChartsColumnConfig chartsColumn = chartsConfigMapper.getChartsColumn(id);
-        String tableName = chartsUtilService.getSqlStr(token, id, dashId) + " emp";
+        String tableName = chartsUtilService.getSqlStr(token, id, dashId);
+        tableName = tableName==""? "":tableName + " emp";
         int baseId = getChartsDataUtilService.getBaseId(id);
         List<Screen> screens = individualConfigInfo.getFilters();
         ScreenStr scr = new ScreenStr();