From 8985fe480fa1804f4c8aac27940ac71aef317b55 Mon Sep 17 00:00:00 2001
From: Wang Chen Chen <932560435@qq.com>
Date: Fri, 29 Mar 2024 18:23:40 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=87=E7=BA=A7=20pom.xml=20=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=202.=E4=BF=AE=E5=A4=8D=20getKeywordsQueryWrapper=20?=
 =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xaaef/molly/tenant/base/service/impl/BaseServiceImpl.java | 4 ++--
 server/pom.xml                                                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/plugins/mbp-tenant/src/main/java/com/xaaef/molly/tenant/base/service/impl/BaseServiceImpl.java b/server/plugins/mbp-tenant/src/main/java/com/xaaef/molly/tenant/base/service/impl/BaseServiceImpl.java
index 037fcf4..605f51a 100644
--- a/server/plugins/mbp-tenant/src/main/java/com/xaaef/molly/tenant/base/service/impl/BaseServiceImpl.java
+++ b/server/plugins/mbp-tenant/src/main/java/com/xaaef/molly/tenant/base/service/impl/BaseServiceImpl.java
@@ -116,9 +116,9 @@ public class BaseServiceImpl<M extends BaseMapper<T>, T extends BaseEntity> exte
         if (ObjectUtils.isNotEmpty(params.getStartDate())) {
             // 如果结束时间是否为空
             if (ObjectUtils.isNotEmpty(params.getEndDate())) {
-                wrapper.between(CREATE_TIME, params.getStartDate(), params.getEndDate());
+                wrapper.between(String.format("DATE(%s)", CREATE_TIME), params.getStartDate(), params.getEndDate());
             } else {
-                wrapper.between(CREATE_TIME, params.getStartDate(), LocalDate.now());
+                wrapper.between(String.format("DATE(%s)", CREATE_TIME), params.getStartDate(), LocalDate.now());
             }
         }
         if (StringUtils.isNotBlank(params.getKeywords()) && columns != null && !columns.isEmpty()) {
diff --git a/server/pom.xml b/server/pom.xml
index 1755a4a..49ad703 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -55,7 +55,7 @@
         <!-- MyBatis 的增强工具，基友搭配，效率翻倍 -->
         <mybatis-plus.version>3.5.5</mybatis-plus.version>
         <!-- JavaEE 颠覆者 -->
-        <spring-boot.version>3.2.3</spring-boot.version>
+        <spring-boot.version>3.2.4</spring-boot.version>
     </properties>