ci:更改报告详情接口标签名字段名

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());
+            List<String> reportLabelIds = reportLabelEntities.stream().map(ReportLabelEntity::getLabelId).collect(Collectors.toList());
-            reportDetailVo.setLabelIds(reportLabelIds);
+            reportDetailVo.setLabelList(reportLabelIds);
-            List<TreeLabelEntity> labelEntities = iTreeLabelService.query().in("id", reportLabelIds).list();
+            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())) {

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;
 }