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 14cf88c..75e7ab0 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 @@ -352,6 +352,10 @@ public class IReportServiceImpl extends ServiceImpl log.info(key + "已经删除"); nameList.add(entity.getName()); } + //删除报告内容表中的记录 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.in(ReportContentEntity::getReportId, idList); + iReportContentService.remove(wrapper); return nameList; } @@ -465,7 +469,7 @@ public class IReportServiceImpl extends ServiceImpl powerList.add(PREVIEW); powerList.add(DOWNLOAD); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.in(PowerApply::getReportId, list.getRecords().stream().map(ReportVo::getId).collect(Collectors.toList())); + wrapper.in(CollectionUtils.isNotEmpty(list.getRecords()) ,PowerApply::getReportId, list.getRecords().stream().map(ReportVo::getId).collect(Collectors.toList())); wrapper.in(PowerApply::getPower, powerList); wrapper.eq(PowerApply::getUserId, UserUtils.getUserId()); wrapper.eq(PowerApply::getDelFlag, 0);