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 f010453..0bc42c1 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 @@ -537,12 +537,15 @@ public class IReportServiceImpl 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); + } } }); }