Merge remote-tracking branch 'origin/master'

2023-04-28 18:21:18 +08:00
parent dd3c7a2554 e44fb0ca86
commit dec6625584
1 changed files with 2 additions and 0 deletions
@@ -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);