From 6334e689432245a680a22d95c94d9ed1d4f1c2dc Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Thu, 11 May 2023 17:46:05 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=8A=A5=E5=91=8A=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E6=A0=87=E7=AD=BEid?= =?UTF-8?q?=E5=92=8C=E6=A0=87=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit （更改为后端返回） --- .../com/adc/da/report/service/impl/IReportServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 bbd221a..b373f3d 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 @@ -658,8 +658,11 @@ public class IReportServiceImpl extends ServiceImpl wrapper.eq(ReportLabelEntity::getReportId, reportId); List reportLabelEntities = reportLabelDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(reportLabelEntities)) { - List reportLabelIds = reportLabelEntities.stream().map(ReportLabelEntity::getLabelId).collect(Collectors.toList()); - reportDetailVo.setLabelList(reportLabelIds); + List reportLabelIds = reportLabelEntities.stream().map(ReportLabelEntity::getLastLabel).collect(Collectors.toList()); + reportDetailVo.setLabelIds(reportLabelIds); + List labelEntities = iTreeLabelService.query().in("id", reportLabelIds).list(); + List labels = labelEntities.stream().map(TreeLabelEntity::getLabel).collect(Collectors.toList()); + reportDetailVo.setLabelList(labels); } //设置当前用户受否有下载权限 if (UserUtils.getUserId().equals(reportDetailVo.getCreateUserId())) {