From 93e9361cf9a2c82a58ade9c6c426f6dc4104db84 Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Fri, 19 May 2023 09:06:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=9C=AA=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=9A=84=E8=80=81=E6=9D=83=E9=99=90=EF=BC=8C=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E4=B8=BA=E5=85=AC=E7=94=A8=E9=89=B4=E6=9D=83=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit e80224bbae697219bfcc6863561edcbb5372897f)
---
 .../report/constant/PowerApplyConstants.java  |  5 ----
 .../service/impl/IReportServiceImpl.java      | 27 +++----------------
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java b/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java
index 70f24be..6382670 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/constant/PowerApplyConstants.java
@@ -27,11 +27,6 @@ public class PowerApplyConstants {
      */
     public static final Integer DOWNLOAD = 3;
 
-    /**
-     * 总监levelId值 暂定 <=0.5
-     */
-    public static final Double DIRECTOR_LEVEL = 0.5;
-
     /**
      * 有预览和下载全部报告权限的levelId
      */
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 6797069..9cf306c 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
@@ -710,34 +710,13 @@ public class IReportServiceImpl extends ServiceImpl<ReportDao, ReportEntity>
             List<String> labels = labelEntities.stream().map(TreeLabelEntity::getLabel).collect(Collectors.toList());
             reportDetailVo.setLabels(labels);
         }
-        //设置当前用户受否有下载权限
-        if (UserUtils.getUserId().equals(reportDetailVo.getCreateUserId())) {
+        //判断当前用户有没有下载权限
+        if (isAllowDownload(UserUtils.getUserId(),reportId)) {
             reportDetailVo.setDownPower(1);
         } else {
             reportDetailVo.setDownPower(0);
-            //查看申请权限表的权限
-            List<Integer> powerList = new ArrayList<>();
-            powerList.add(PREVIEW_DOWNLOAD);
-            powerList.add(DOWNLOAD);
-            LambdaQueryWrapper<PowerApply> powerApplyLambdaQueryWrapper = new LambdaQueryWrapper<>();
-            powerApplyLambdaQueryWrapper.in(PowerApply::getPower, powerList);
-            powerApplyLambdaQueryWrapper.eq(PowerApply::getReportId, reportId);
-            List<PowerApply> list = iPowerApplyService.list(powerApplyLambdaQueryWrapper);
-            if (CollectionUtils.isNotEmpty(list)) {
-                list.forEach(powerApply -> {
-                    if (powerApply.getUserId().equals(UserUtils.getUserId())) {
-                        reportDetailVo.setDownPower(1);
-                    }
-                });
-            }
-            UserEO userEo = userEODao.selectById(UserUtils.getUserId());
-            String levelId = userEo.getLevelId() == null ? "0.8" : userEo.getLevelId();
-            //用户级别
-            double level = Double.parseDouble(levelId);
-            if (level <= 0.5) {
-                reportDetailVo.setDownPower(1);
-            }
         }
+
         //报告日志管理
         reportLog(reportDetailVo.getName(),"预览");
         return Result.success(reportDetailVo);