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 1b8ca9c25d..52cf40e741 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 @@ -86,18 +86,17 @@ public class CustomWhere2Str { res.add("(" + whereName + " IN ('" + String.join("','", request.getEnumCheckField()) + "'))"); } } else { + if (field.getDeType() == 1) { + // 规定几种日期格式,一一匹配,匹配到就是该格式 + whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName); + } + List filter = request.getFilter(); for (ChartCustomFilterItemDTO filterItemDTO : filter) { String value = filterItemDTO.getValue(); String whereTerm = Utils.transFilterTerm(filterItemDTO.getTerm()); String whereValue = ""; -// String whereNameReal; - if (field.getDeType() == 1) { - // 规定几种日期格式,一一匹配,匹配到就是该格式 - whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName); - } - if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "null")) { whereValue = ""; } else if (StringUtils.equalsIgnoreCase(filterItemDTO.getTerm(), "not_null")) {