Merge remote-tracking branch 'origin/master'

adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java

@@ -338,6 +338,7 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
             reportLabelEntities.forEach(reportLabelEntity -> {
                 idSet.add(reportLabelEntity.getReportId());
             });
+            idSet.add("1");
         }
 
 
@@ -410,6 +411,7 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
             reportLabelEntities.forEach(reportLabelEntity -> {
                 idSet.add(reportLabelEntity.getReportId());
             });
+            idSet.add("1");
         }
 
         IPage<ReportVo> list = reportDao.reportManagerPage(page, vo, idSet);