From a04a5a9a69d2a49d2c5c8f897e49070aa8c8cf3b Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 7 Aug 2024 16:52:07 +0800 Subject: [PATCH] =?UTF-8?q?feat(88189):=20=E6=A0=87=E5=87=86=E6=8B=86?= =?UTF-8?q?=E5=88=86--=E7=BC=96=E8=BE=91--=E6=9F=A5=E8=AF=A2--=E5=A4=9A?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E6=9F=A5=E8=AF=A2=EF=BC=8C=E6=9F=A5=E7=9A=84?= =?UTF-8?q?=E6=98=AF=E8=8C=83=E5=9B=B4=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../documenttool/handler/impl/DateManyConditionImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/handler/impl/DateManyConditionImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/handler/impl/DateManyConditionImpl.java index eaa5d87f..08bd0a96 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/handler/impl/DateManyConditionImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/handler/impl/DateManyConditionImpl.java @@ -41,9 +41,9 @@ public class DateManyConditionImpl extends AbstractConditionBase { String substringEndFirst = ", ',', 1)"; String substringEndLast = ", ',', -1)"; String dateMany = DocumentSplitCommon.AND; - if (value.contains(",")) { + String[] split = value.split(","); + if (value.contains(",") && !split[0].equals(split[1])) { // 范围查询 - String[] split = value.split(","); dateMany += "("; String startDate = DocumentSplitCommon.DATE_FORMAT_BEGIN + "'" + split[0] + "'" + DocumentSplitCommon.DATE_FORMAT_END; String endDate = DocumentSplitCommon.DATE_FORMAT_BEGIN + "'" + split[1] + "'" + DocumentSplitCommon.DATE_FORMAT_END; @@ -63,6 +63,7 @@ public class DateManyConditionImpl extends AbstractConditionBase { endDate + DocumentSplitCommon.BETWEEN + DocumentSplitCommon.DATE_FORMAT_BEGIN + substringBegin + fieldName + substringEndFirst + DocumentSplitCommon.DATE_FORMAT_END + DocumentSplitCommon.AND + DocumentSplitCommon.DATE_FORMAT_BEGIN + substringBegin + fieldName + substringEndLast + DocumentSplitCommon.DATE_FORMAT_END + ")" + ")"; } else { + value = split[0]; dateMany += fieldName + DocumentSplitCommon.LIKE + DocumentSplitCommon.CONCAT_LIKE_BEGIN + value + DocumentSplitCommon.CONCAT_LIKE_END; } return dateMany;