|
|
@@ -46,9 +46,9 @@ public class ScreenUtil {
|
|
|
String nowType = StringUtils.hasText(type)?type:xColumnType;//钻取的类型优先 没有则使用x轴的类型
|
|
|
|
|
|
if( "isNull".equals(symbol) ){//字段值为null
|
|
|
- ret = ret + " and " + columnName + " is null ";
|
|
|
+ ret = ret + " and (" + columnName + " is null or " + columnName + " = '' )";
|
|
|
}else if( "isNotNull".equals(symbol) ){//字段值不为null
|
|
|
- ret = ret + " and " + columnName + " is not null ";
|
|
|
+ ret = ret + " and (" + columnName + " is not null or " + columnName + " = '' )";
|
|
|
}else if (columnType != "time" && !("time".equals(columnType))) {
|
|
|
String symbVal = getSymbAndVal(symbol, value, columnType);
|
|
|
ret = ret + " and " + columnName + " " + symbVal;
|
hy