From f59b25a85cc54c13159adfb6f8bbf5a000091ee6 Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 16 May 2023 16:05:37 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D[=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=8A=A5=E9=94=99]Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 编辑报告-部门为空的时候，编辑按钮报错 --- .../da/report/service/impl/IReportServiceImpl.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java index e54a37a..3f4bf17 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java @@ -689,11 +689,13 @@ public class IReportServiceImpl extends ServiceImpl ReportDetailVo reportDetailVo = reportDao.reportDetail(reportId); //设置部门名称 String department = reportDetailVo.getDepartment(); - String[] idArray = department.split(","); - List orgEOList = orgEOService.query().in("ID", idArray).list(); - if (CollectionUtils.isNotEmpty(orgEOList)) { - String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); - reportDetailVo.setDepartmentName(departmentName); + if (StrUtil.isNotBlank(department)) { + String[] idArray = department.split(","); + List orgEOList = orgEOService.query().in("ID", idArray).list(); + if (CollectionUtils.isNotEmpty(orgEOList)) { + String departmentName = orgEOList.stream().map(OrgEO::getOrgName).collect(Collectors.joining(",")); + reportDetailVo.setDepartmentName(departmentName); + } } //设置标签列表