From 4694580ca19e144c52390fd1670faf1909636ec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 15 Jun 2021 01:09:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=97=A5=E5=BF=97=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=AE=B5=E6=9F=A5=E8=AF=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jsh/erp/service/log/LogService.java     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java
index a65016a1..1da17182 100644
--- a/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java
+++ b/jshERP-boot/src/main/java/com/jsh/erp/service/log/LogService.java
@@ -67,6 +67,8 @@ public class LogService {
                                    String content, int offset, int rows)throws Exception {
         List<LogVo4List> list=null;
         try{
+            beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
+            endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
             list=logMapperEx.selectByConditionLog(operation, userId, clientIp, status, beginTime, endTime,
                     content, offset, rows);
             if (null != list) {
@@ -84,6 +86,8 @@ public class LogService {
                         String content)throws Exception {
         Long result=null;
         try{
+            beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME);
+            endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME);
             result=logMapperEx.countsByLog(operation, userId, clientIp, status, beginTime, endTime, content);
         }catch(Exception e){
             JshException.readFail(logger, e);