From fd51ec13e6b860d4c0dee2bb9c1ad47ddfe0dbec Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Mon, 15 May 2023 15:06:18 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8DBug=E3=80=9069257?=
 =?UTF-8?q?=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

已经有预览权限 有申请下载权限 结果流程走完没有下载权限
---
 .../service/impl/IReportServiceImpl.java      | 20 +++++++++----------
 1 file changed, 9 insertions(+), 11 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 75e7ab0..895ae72 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
@@ -480,25 +480,23 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
 
             //设置权限
             list.getRecords().forEach(reportVo -> {
+                //无权限要求的报告自带预览权限
+                if (reportVo.getConfidentialLevel().equals(PUBLIC_REPORT) &&
+                        reportVo.getPrivacyLevel().equals(NO_USER_PRIVACY_INVOLVED)) {
+                    reportVo.setPower(PREVIEW);
+                } else {
+                    reportVo.setPower(NONE);
+                }
                 List<PowerApply> powerApplies = reportPowerMap.get(reportVo.getId());
                 if (powerApplies != null) {
-                    if (powerApplies.size() == 1) {
+                    //只有当PA表只有一条申请的权限且并不是公开表的时候才给权限
+                    if (powerApplies.size() == 1 && reportVo.getPower().equals(NONE)) {
                         reportVo.setPower(powerApplies.get(0).getPower());
                     } else {
                         reportVo.setPower(PREVIEW_DOWNLOAD);
                     }
                 }
 
-                //只有用户没有权限的时候才给默认权限
-                if (reportVo.getPower() == null) {
-                    //其余人员只能预览公开报告（涉密等级：公开（内部公开）、隐私等级：不涉及用户隐私）
-                    if (reportVo.getConfidentialLevel().equals(PUBLIC_REPORT) &&
-                            reportVo.getPrivacyLevel().equals(NO_USER_PRIVACY_INVOLVED)) {
-                        reportVo.setPower(PREVIEW);
-                    } else {
-                        reportVo.setPower(NONE);
-                    }
-                }
                 //如果上传人是自己也有预览下载权限
                 if (UserUtils.getUserId().equals(reportVo.getCreateUserId())) {
                     reportVo.setPower(PREVIEW_DOWNLOAD);