From fdf11997d11b2ab9d3c4976b562490c5da88c739 Mon Sep 17 00:00:00 2001 From: junjun Date: Mon, 25 Mar 2024 10:52:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E8=A1=A8=E5=88=86=E9=A1=B5=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E4=B8=8B=E9=A2=84=E8=A7=88=E6=95=B0=E6=8D=AE=E5=8F=AA=E6=9C=89?= =?UTF-8?q?1=E6=9D=A1=E7=9A=84bug=20#8577?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 75fece5654..27d0fe943e 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -731,7 +731,11 @@ public class ChartViewService { } if (chartExtRequest.getPageSize() == null) { String pageSize = (String) mapSize.get("tablePageSize"); - chartExtRequest.setPageSize(Math.min(Long.parseLong(pageSize), view.getResultCount().longValue())); + if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) { + chartExtRequest.setPageSize(Math.min(Long.parseLong(pageSize), view.getResultCount().longValue())); + } else { + chartExtRequest.setPageSize(Long.parseLong(pageSize)); + } } } else { if (StringUtils.equalsIgnoreCase(view.getResultMode(), "custom")) { @@ -1856,7 +1860,7 @@ public class ChartViewService { } Date date = simpleDateFormat.parse(cTime); calendar.setTime(date); - calendar.add(Calendar.DAY_OF_YEAR,6);// 加6天用一周最后一天计算周，可避免跨年的问题 + calendar.add(Calendar.DAY_OF_YEAR, 6);// 加6天用一周最后一天计算周，可避免跨年的问题 calendar.add(Calendar.WEEK_OF_YEAR, -1); lastTime = simpleDateFormat.format(calendar.getTime()); }