From 9c8b846a1eee0168be41ec974c89c94ec5dde61e Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Fri, 26 Aug 2022 18:06:31 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.5=E3=80=91=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E4=B8=BA=E5=BD=93=E5=A4=A9?=
 =?UTF-8?q?=E7=9A=84=E6=97=A5=E5=BF=97=E6=97=A0=E6=B3=95=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modular/loginlog/service/impl/SysLoginLogServiceImpl.java | 4 ++--
 .../roses/kernel/log/db/service/impl/SysLogServiceImpl.java   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java
index 53220bd91..42399807f 100644
--- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java
+++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java
@@ -183,11 +183,11 @@ public class SysLoginLogServiceImpl extends ServiceImpl<SysLoginLogMapper, SysLo
 
         Date beginDate = null;
         if (StrUtil.isNotBlank(sysLoginLogRequest.getBeginTime())) {
-            beginDate = DateUtil.parseDate(sysLoginLogRequest.getBeginTime()).toJdkDate();
+            beginDate = DateUtil.parseDateTime(sysLoginLogRequest.getBeginTime() + " 00:00:00").toJdkDate();
         }
         Date endDate = null;
         if (StrUtil.isNotBlank(sysLoginLogRequest.getEndTime())) {
-            endDate = DateUtil.parseDate(sysLoginLogRequest.getEndTime()).toJdkDate();
+            endDate = DateUtil.parseDateTime(sysLoginLogRequest.getEndTime() + " 23:59:59").toJdkDate();
         }
 
         // SQL条件拼接
diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java
index 9ac965c35..86196dc6c 100644
--- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java
+++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java
@@ -135,10 +135,10 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
         Date beginDate = null;
         Date endDate = null;
         if (StrUtil.isNotBlank(beginDateTime)) {
-            beginDate = DateUtil.parseDate(beginDateTime + " 00:00:00").toJdkDate();
+            beginDate = DateUtil.parseDateTime(beginDateTime + " 00:00:00").toJdkDate();
         }
         if (StrUtil.isNotBlank(endDateTime)) {
-            endDate = DateUtil.parseDate(endDateTime + " 23:59:59").toJdkDate();
+            endDate = DateUtil.parseDateTime(endDateTime + " 23:59:59").toJdkDate();
         }
 
         // SQL条件拼接