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 b373f3d..e0628d2 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,11 +658,12 @@ 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::getLastLabel).collect(Collectors.toList()); - reportDetailVo.setLabelIds(reportLabelIds); - List labelEntities = iTreeLabelService.query().in("id", reportLabelIds).list(); + List reportLabelIds = reportLabelEntities.stream().map(ReportLabelEntity::getLabelId).collect(Collectors.toList()); + reportDetailVo.setLabelList(reportLabelIds); + List lastLabels = reportLabelEntities.stream().map(ReportLabelEntity::getLastLabel).collect(Collectors.toList()); + List labelEntities = iTreeLabelService.query().in("id", lastLabels).list(); List labels = labelEntities.stream().map(TreeLabelEntity::getLabel).collect(Collectors.toList()); - reportDetailVo.setLabelList(labels); + reportDetailVo.setLabels(labels); } //设置当前用户受否有下载权限 if (UserUtils.getUserId().equals(reportDetailVo.getCreateUserId())) { diff --git a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java index a70417c..bd574f6 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java +++ b/adc-da-report/src/main/java/com/adc/da/report/vo/ReportDetailVo.java @@ -84,7 +84,7 @@ public class ReportDetailVo { private List labelIds; /** - * 标签列表名 + * 标签id(完整路径) */ private List labelList; @@ -97,4 +97,9 @@ public class ReportDetailVo { * 用户权限级别 */ private Double levelId; + + /** + * 标签列表名 + */ + private List labels; }