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/dao/chart/ShowChartsMapper.java

@@ -28,7 +28,7 @@ public interface ShowChartsMapper {
 
 
     //XY轴数据
-    @Select("select ${dataType}(${yAxisName}) as \"value\",${xColumn} as \"date\" from ${tableName} where ${screen} group by ${xColumn}")
+    @Select("select ${dataType}(${yAxisName}) as \"value\",${xColumn} as \"date\" from ${tableName} where 1=1 ${screen} group by ${xColumn}")
     List<LineSeriesMap> getXAndYValues(@Param("yAxisName") String yAxisName, @Param("xColumn") String xColumn,
                           @Param("tableName") String tableName, @Param("dataType") String dataType,
                           @Param("screen") String screen);

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

@@ -135,7 +135,7 @@ public class ShowScatterService {
             //无分组时Y值
             if (!"time".equals(xColumnType)) {
                 if (StringUtils.isEmpty(screenToColumnS)) {
-                    screenToColumnS = " 1 = 1 ";
+                    screenToColumnS = " and 1 = 1 ";
                 }
                 value = showChartsMapper.getXAndYValues(yColumn, xColumn, tableName, yAxisType, screenToColumnS);
             } else {