【BI商业智能】【报表制作】【图表】

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

@@ -78,7 +78,8 @@ public class ShowPieService {
         int id = pieConfigInfo.getId();
         int baseId = getChartsDataUtilService.getBaseId(id);
         ChartsColumnConfig chartsColumn = chartsConfigMapper.getChartsColumn(id);
-        String tableName = chartsUtilService.getSqlStr(token, id, dashId) + " tmp ";
+        String tableName = chartsUtilService.getSqlStr(token, id, dashId);
+        tableName = tableName==""?"":tableName + " tmp ";
         /* 参数校验 */
         if (ObjectUtils.isEmpty(chartsColumn)){
             return new RepEntity(RepCode.Null);

bi-server/src/main/java/com/usoftchina/bi/server/utils/ScreenUtil.java

@@ -103,7 +103,7 @@ public class ScreenUtil {
                 symbol = "notIn".equals(symbol) ? "not in" : "in";
                 value = getNotInItems(columnType, type, value);
                 String symbVal = getTimeSymbAndVal(symbol, value);
-                String column = getTimeColumn(columnName, nowType);
+                String column = "time".equals(columnType)?getTimeColumn(columnName, nowType):columnName;
                 ret = ret + " and " + column + " " + symbVal;
 
             }else if (!("time".equals(columnType))) {