diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java index 9ecd50b553..f487bd99b2 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java @@ -182,8 +182,11 @@ public class CustomWhere2Str { whereValue = String.format(SQLConstants.WHERE_BETWEEN, Utils.transLong2Str(stringLongMap.get("startTime")), Utils.transLong2Str(stringLongMap.get("endTime"))); } } else { + long ts = Utils.allDateFormat2Long(value); if (isCross) { - value = Utils.allDateFormat2Long(value) + ""; + value = ts + ""; + } else { + value = Utils.transLong2Str(ts); } whereValue = String.format(SQLConstants.WHERE_VALUE_VALUE, value); } diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java index 9964e512c3..5180dfae72 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java @@ -192,8 +192,11 @@ public class WhereTree2Str { whereValue = String.format(SQLConstants.WHERE_BETWEEN, Utils.transLong2Str(stringLongMap.get("startTime")), Utils.transLong2Str(stringLongMap.get("endTime"))); } } else { + long ts = Utils.allDateFormat2Long(value); if (isCross) { - value = Utils.allDateFormat2Long(value) + ""; + value = ts + ""; + } else { + value = Utils.transLong2Str(ts); } whereValue = String.format(SQLConstants.WHERE_VALUE_VALUE, value); }