From d0048d9d68f35a2cd10d271b8239ad84d9ff9b0b Mon Sep 17 00:00:00 2001 From: gongbiao Date: Sat, 16 Mar 2019 14:22:13 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=8B=BC=E5=9B=A2=E8=90=A5=E9=94=80=E5=88=86?= =?UTF-8?q?=E6=9E=90][=E4=BF=AE=E6=94=B9][=E5=8F=82=E6=95=B0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/service/impl/WxChartServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java index 96a2e9e35..7b31bbea0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxChartServiceImpl.java @@ -1568,7 +1568,7 @@ public class WxChartServiceImpl implements WxChartDataService { Map result = new HashMap<>(); Date startTime = new Date(); Date endTime = startTime; - if (startdate == null) { + if (paramsMap.get("startdate") == null) { Calendar c = Calendar.getInstance(); c.add(Calendar.MONTH, 0); c.set(Calendar.DAY_OF_MONTH, 1); @@ -1578,7 +1578,7 @@ public class WxChartServiceImpl implements WxChartDataService { startTime = DateUtils.stringToDate(startdate + " 00:00:00"); params.put("startdate", startTime); } - if (enddate == null) { + if (paramsMap.get("enddate") == null) { params.put("enddate", endTime); } else { endTime = DateUtils.stringToDate(enddate + " 23:59:59");