From ef81234434cfe247a59c5a6690b73b47e6b6053b Mon Sep 17 00:00:00 2001 From: Mzaxd Date: Tue, 9 May 2023 17:21:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=8E=A5=E5=8F=A3=E7=94=A8=E6=88=B7=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=B8=BAnull=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/service/impl/IReportServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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); + } } }); }