From 589540b259b70bd9073426cad993fc8282b347b1 Mon Sep 17 00:00:00 2001 From: fancy Date: Fri, 21 Jan 2022 16:56:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=20=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=E7=AB=AF=E6=89=93=E5=8D=A1=E4=BF=A1=E6=81=AF=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BC=A0=E5=85=A5=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=9A=84bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../attendancedetail/ActionListMobileWithFilter.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListMobileWithFilter.java b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListMobileWithFilter.java index c8a0707a50..226f32b7bf 100644 --- a/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListMobileWithFilter.java +++ b/o2server/x_attendance_assemble_control/src/main/java/com/x/attendance/assemble/control/jaxrs/attendancedetail/ActionListMobileWithFilter.java @@ -93,10 +93,12 @@ public class ActionListMobileWithFilter extends BaseAction { "查询结束日期格式异常，格式：yyyy-mm-dd.日期：" + wrapIn.getEndDate()); result.error(exception); logger.error(e, currentPerson, request, null); + // 错误的格式 清空 没有endDate 只查询startDate当天数据 + if ( StringUtils.isNotEmpty( wrapIn.getEndDate() )) { + wrapIn.setEndDate(null); + } } - if ( StringUtils.isNotEmpty( wrapIn.getEndDate() )) { - wrapIn.setEndDate(wrapIn.getStartDate()); - } + } if ( StringUtils.isNotEmpty( wrapIn.getStartDate() )) { try { @@ -105,7 +107,7 @@ public class ActionListMobileWithFilter extends BaseAction { } catch (Exception e) { check = false; Exception exception = new ExceptionAttendanceDetailProcess(e, - "查询开始日期格式异常，格式：yyyy-mm-dd.日期：" + wrapIn.getEndDate()); + "查询开始日期格式异常，格式：yyyy-mm-dd.日期：" + wrapIn.getStartDate()); result.error(exception); logger.error(e, currentPerson, request, null); } -- GitLab