From 4558a8aa0755970c36148412e4b5d0fa9f01b76c Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Thu, 11 May 2023 18:10:37 +0800
Subject: [PATCH] =?UTF-8?q?ci:=E6=9B=B4=E6=94=B9=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3=E6=A0=87=E7=AD=BE=E5=90=8D?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/report/service/impl/IReportServiceImpl.java   | 9 +++++----
 .../main/java/com/adc/da/report/vo/ReportDetailVo.java   | 7 ++++++-
 2 files changed, 11 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 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<ReportDao, ReportEntity>
         wrapper.eq(ReportLabelEntity::getReportId, reportId);
         List<ReportLabelEntity> reportLabelEntities = reportLabelDao.selectList(wrapper);
         if (CollectionUtils.isNotEmpty(reportLabelEntities)) {
-            List<String> reportLabelIds = reportLabelEntities.stream().map(ReportLabelEntity::getLastLabel).collect(Collectors.toList());
-            reportDetailVo.setLabelIds(reportLabelIds);
-            List<TreeLabelEntity> labelEntities = iTreeLabelService.query().in("id", reportLabelIds).list();
+            List<String> reportLabelIds = reportLabelEntities.stream().map(ReportLabelEntity::getLabelId).collect(Collectors.toList());
+            reportDetailVo.setLabelList(reportLabelIds);
+            List<String> lastLabels = reportLabelEntities.stream().map(ReportLabelEntity::getLastLabel).collect(Collectors.toList());
+            List<TreeLabelEntity> labelEntities = iTreeLabelService.query().in("id", lastLabels).list();
             List<String> 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<String> labelIds;
 
     /**
-     * 标签列表名
+     * 标签id（完整路径）
      */
     private List<String> labelList;
 
@@ -97,4 +97,9 @@ public class ReportDetailVo {
      * 用户权限级别
      */
     private Double levelId;
+
+    /**
+     * 标签列表名
+     */
+    private List<String> labels;
 }