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())) {