diff --git a/modules/global/src/com/haulmont/cuba/core/global/DateTimeTransformations.java b/modules/global/src/com/haulmont/cuba/core/global/DateTimeTransformations.java index 32fa88d590..4638285261 100644 --- a/modules/global/src/com/haulmont/cuba/core/global/DateTimeTransformations.java +++ b/modules/global/src/com/haulmont/cuba/core/global/DateTimeTransformations.java @@ -36,7 +36,9 @@ public class DateTimeTransformations { public ZonedDateTime transformToZDT(Object date) { Preconditions.checkNotNull(date); ZoneId zoneId = ZoneId.systemDefault(); - if (date instanceof Date) { + if (date instanceof java.sql.Date) { + ((java.sql.Date) date).toLocalDate().atStartOfDay(zoneId); + } else if (date instanceof Date) { return ((Date) date).toInstant().atZone(zoneId); } else if (date instanceof LocalDate) { return ((LocalDate) date).atStartOfDay(zoneId);