From 62f6c2cf0716bbbbf24a7a79fa6c1cf14f71df10 Mon Sep 17 00:00:00 2001 From: wangshaoping Date: Fri, 15 Aug 2025 09:26:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=A1=86=E6=9E=B6=E5=8F=91?= =?UTF-8?q?=E5=B8=83:=208.2.32=20=20=201)=20=E6=94=AF=E6=8C=81=E5=9B=9E?= =?UTF-8?q?=E9=80=80=E6=97=B6=E8=BF=94=E5=9B=9E=E7=BB=99=E5=8E=9F=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=BA=BA,=20=E6=8F=90=E4=BA=A4=E6=97=B6=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=BB=BB=E5=8A=A1=E5=80=99=E9=80=89=E5=A4=84=E7=90=86?= =?UTF-8?q?=E4=BA=BA=20=20=202)=20=E6=94=AF=E6=8C=81=E5=AE=9A=E6=80=A7?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E8=A1=A5=E5=BD=95=E6=8E=A7=E4=BB=B6=E7=9A=84?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=20=20=203=EF=BC=89=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=B1=9E=E6=80=A7=20MODIFY=5FIF=20=E8=A1=A5?= =?UTF-8?q?=E5=BD=95=E6=8E=A7=E4=BB=B6=E9=85=8D=E7=BD=AE=20=20=204?= =?UTF-8?q?=EF=BC=89=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E6=89=A9=E5=B1=95=E8=A1=A8=E7=9A=84=E6=9C=BA=E5=88=B6?= =?UTF-8?q?=EF=BC=8C=E9=87=87=E7=94=A8=20start=20=E7=9B=91=E5=90=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 前端核心发布: 8.2.123 1) 首页任务列表增加按日期倒序 2）修改了用户选择机构的操作模式 --- .../orm/service/support/criteria/impl/BetweenInclusive.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/BetweenInclusive.java b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/BetweenInclusive.java index defcd8d6..96088f74 100644 --- a/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/BetweenInclusive.java +++ b/io.sc.platform.orm/src/main/java/io/sc/platform/orm/service/support/criteria/impl/BetweenInclusive.java @@ -27,12 +27,12 @@ public class BetweenInclusive extends Between { }else if(StringUtils.hasText(start) && StringUtils.hasText(end)) { return builder.and( builder.greaterThanOrEqualTo(path, (Comparable)conversionService.convert(start, clazz)), - builder.lessThanOrEqualTo(path, (Comparable)conversionService.convert(end, clazz)) + builder.lessThan(path, (Comparable)conversionService.convert(end, clazz)) ); }else if(StringUtils.hasText(start)){ return builder.greaterThanOrEqualTo(path, (Comparable)conversionService.convert(start, clazz)); }else{ - return builder.lessThanOrEqualTo(path, (Comparable)conversionService.convert(end, clazz)); + return builder.lessThan(path, (Comparable)conversionService.convert(end, clazz)); } }else{ throw new OperatorTypeNotSupportedException("[" + operator + "] only support the field with java.lang.Comparable type, field [" + fieldName + "]'s type is " + clazz.getName());