From 5f55dba784037caa496b6ba31533662535e10eef Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Thu, 11 May 2023 18:18:25 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=94=AF=E6=8C=81=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/report/controller/ReportManageConroller.java  | 9 ++++++---
 .../java/com/adc/da/report/service/IReportService.java   | 7 ++++---
 .../adc/da/report/service/impl/IReportServiceImpl.java   | 2 --
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
index 291e066..dd007e0 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/controller/ReportManageConroller.java
@@ -1,5 +1,6 @@
 package com.adc.da.report.controller;
 
+import cn.hutool.core.util.StrUtil;
 import com.adc.da.login.util.UserUtils;
 import com.adc.da.report.annotation.ReportLog;
 import com.adc.da.report.dao.mysql.ReportDao;
@@ -447,9 +448,11 @@ public class ReportManageConroller {
     @GetMapping("/download")
     public void downloadPic(HttpServletResponse response, String fileId,String repostId) throws IOException {
 
-        //校验权限
-        if (!reportService.isAllowDownload(UserUtils.getUserId(), repostId)) {
-            throw new AdcDaBaseException("无此报告下载权限");
+        if (StrUtil.isNotBlank(repostId)) {
+            //校验权限
+            if (!reportService.isAllowDownload(UserUtils.getUserId(), repostId)) {
+                throw new AdcDaBaseException("无此报告下载权限");
+            }
         }
 
         try  {
diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java b/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java
index c408b45..89db162 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/IReportService.java
@@ -71,9 +71,10 @@ public interface IReportService {
 
     /**
      * 判断用户是否允许下载指定报告
-     * @param userId 用户id
-     * @param reportId 报告id
+     *
+     * @param userId   用户id
+     * @param repostId
      * @return 是否有下载权限
      */
-    Boolean isAllowDownload(String userId, String reportId);
+    Boolean isAllowDownload(String userId, String repostId);
 }
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 e0628d2..e8df43b 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
@@ -26,9 +26,7 @@ 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.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;