From 0bc9d2de78d852ce990e95c9cc8bdf878c8c7130 Mon Sep 17 00:00:00 2001 From: fit2cloud-chenyw Date: Tue, 2 Aug 2022 21:53:39 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):=20=E5=AE=9A=E6=97=B6?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=B8=8D=E5=B8=A6=E8=A7=86=E5=9B=BE=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=8F=91=E9=80=81=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sechedule/strategy/impl/EmailTaskHandler.java | 13 ++++++++----- .../io/dataease/service/chart/ViewExportExcel.java | 4 ++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java index 916c3a5457..32cac1edc0 100644 --- a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java +++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java @@ -168,12 +168,15 @@ public class EmailTaskHandler extends TaskHandler implements Job { contentStr = new String(content, "UTF-8"); } + List files = null; String viewIds = emailTemplateDTO.getViewIds(); - List viewIdList = Arrays.asList(viewIds.split(",")).stream().map(s -> (s.trim())).collect(Collectors.toList()); - - PermissionProxy proxy = new PermissionProxy(); - proxy.setUserId(user.getUserId()); - List files = viewExportExcel.export(panelId, viewIdList, proxy); + if (StringUtils.isNotBlank(viewIds)) { + List viewIdList = Arrays.asList(viewIds.split(",")).stream().filter(StringUtils::isNotBlank).map(s -> (s.trim())).collect(Collectors.toList()); + PermissionProxy proxy = new PermissionProxy(); + proxy.setUserId(user.getUserId()); + files = viewExportExcel.export(panelId, viewIdList, proxy); + } + emailService.sendWithImageAndFiles(recipients, emailTemplateDTO.getTitle(), contentStr, bytes, files); success(taskInstance); diff --git a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java index ee7cd97324..2cd29212e7 100644 --- a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java +++ b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java @@ -1,5 +1,6 @@ package io.dataease.service.chart; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; @@ -39,6 +40,9 @@ public class ViewExportExcel { @DePermissionProxy(paramIndex = 2) public List export(String panelId, List viewIds, PermissionProxy proxy) throws Exception { + if (CollectionUtils.isEmpty(viewIds)) { + return null; + } PanelGroupService panelGroupService = SpringContextUtil.getBean(PanelGroupService.class); PanelGroupDTO panelDto = panelGroupService.findOne(panelId);