From ff056c44773b22b69ebbab2906ecd89867fa58d1 Mon Sep 17 00:00:00 2001 From: aikai Date: Sun, 28 Apr 2024 11:45:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=8E=B7=E5=8F=96=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=BB=9F=E8=AE=A1bug=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/system/service/worklog/LogStatisticsServiceImpl.java | 2 +- .../src/main/resources/mapper/worklog/LogStatisticsMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java index 53f65310..8f71184d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/worklog/LogStatisticsServiceImpl.java @@ -174,7 +174,7 @@ public class LogStatisticsServiceImpl implements LogStatisticsService { boolean flag = false; List logStatisticsDOS = new ArrayList<>(); List dateList = new ArrayList<>(); - if (dto.getBeginTime() != null && dto.getEndTime() != null) { + if (StrUtil.isNotEmpty(dto.getBeginTime()) && StrUtil.isNotEmpty(dto.getEndTime())) { Date begin = DateUtil.parse(dto.getBeginTime(), "yyyy-MM-dd").toJdkDate(); if (logRuleDO.getType() == 1) { flag = DateUtil.isSameDay(begin, new Date()); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml index 16b16d6d..a04fa97a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/worklog/LogStatisticsMapper.xml @@ -33,7 +33,7 @@ a.dept_id AS deptId, c.`name` AS deptName, b.log_instance_ext_id AS logInstanceExtId, - b.`status` AS `status`, + ifnull(b.`status`,3) AS `status`, d.create_time AS createTime FROM system_users AS a