diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogBookServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogBookServiceImpl.java index bebeb22..834b4a4 100644 --- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogBookServiceImpl.java +++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogBookServiceImpl.java @@ -10,6 +10,7 @@ import com.adc.da.report.vo.ReportDetailThumbUpVo; import com.adc.da.report.vo.ReportLogPageVO; import com.adc.da.util.utils.StringUtils; import com.adc.da.util.utils.UUID; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; @@ -167,8 +168,12 @@ public class IReportLogBookServiceImpl extends ServiceImpl reportLogBookLambdaQueryWrapper = new LambdaQueryWrapper<>(); + reportLogBookLambdaQueryWrapper.eq(ReportLogBook::getReportId, reportId); + reportLogBookLambdaQueryWrapper.eq(ReportLogBook::getType, 3); + reportLogBookLambdaQueryWrapper.eq(ReportLogBook::getUserId, UserUtils.getUserId()); + remove(reportLogBookLambdaQueryWrapper); } @Override @@ -179,7 +184,7 @@ public class IReportLogBookServiceImpl extends ServiceImpl }); } else { list.getRecords().forEach(reportVo -> { - //其余人员只能预览公开报告(涉密等级:公开(内部公开)、隐私等级:不涉及用户隐私) - if (reportVo.getConfidentialLevel().equals(PUBLIC_REPORT) && - reportVo.getPrivacyLevel().equals(NO_USER_PRIVACY_INVOLVED)) { - reportVo.setPower(PREVIEW); - } else { - reportVo.setPower(NONE); + //只有用户没有权限的时候才给默认权限 + if (reportVo.getPower() == null) { + //其余人员只能预览公开报告(涉密等级:公开(内部公开)、隐私等级:不涉及用户隐私) + if (reportVo.getConfidentialLevel().equals(PUBLIC_REPORT) && + reportVo.getPrivacyLevel().equals(NO_USER_PRIVACY_INVOLVED)) { + reportVo.setPower(PREVIEW); + } else { + reportVo.setPower(NONE); + } } }); }