DZ/faw-report-library-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lixuetao' into lixuetao

Browse Source
This commit is contained in:
bupengxiang
2023-05-15 14:39:28 +08:00
parent e844a6fdba aaf1a82462
commit 6f7b48b351
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportServiceImpl.java
+5 -1
View File
@@ -352,6 +352,10 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
log.info(key + "已经删除"); log.info(key + "已经删除");
nameList.add(entity.getName()); nameList.add(entity.getName());
} }
//删除报告内容表中的记录
LambdaQueryWrapper<ReportContentEntity> wrapper = new LambdaQueryWrapper<>();
wrapper.in(ReportContentEntity::getReportId, idList);
iReportContentService.remove(wrapper);
return nameList; return nameList;
} }
@@ -465,7 +469,7 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
powerList.add(PREVIEW); powerList.add(PREVIEW);
powerList.add(DOWNLOAD); powerList.add(DOWNLOAD);
LambdaQueryWrapper<PowerApply> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<PowerApply> 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.in(PowerApply::getPower, powerList);
wrapper.eq(PowerApply::getUserId, UserUtils.getUserId()); wrapper.eq(PowerApply::getUserId, UserUtils.getUserId());
wrapper.eq(PowerApply::getDelFlag, 0); wrapper.eq(PowerApply::getDelFlag, 0);