From e5545d76bbf25c8d9afceb3c91d3b3b8c59c305d Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Tue, 9 May 2023 17:19:38 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=E5=8F=96=E6=B6=88=E7=82=B9=E8=B5=9E=E4=BA=A7=E7=94=9F=E8=84=8F?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AEBug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IReportLogBookServiceImpl.java       | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogBookServiceImpl.java b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogBookServiceImpl.java
index bebeb22..834b4a4 100644
--- a/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogBookServiceImpl.java
+++ b/adc-da-report/src/main/java/com/adc/da/report/service/impl/IReportLogBookServiceImpl.java
@@ -10,6 +10,7 @@ import com.adc.da.report.vo.ReportDetailThumbUpVo;
 import com.adc.da.report.vo.ReportLogPageVO;
 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.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.extern.slf4j.Slf4j;
@@ -167,8 +168,12 @@ public class IReportLogBookServiceImpl extends ServiceImpl<ReportLogBookDao, Rep
         return reportLogBook.getId();
     }
 
-    private void thumbDown(String logId) {
-        removeById(logId);
+    private void thumbDown(String reportId) {
+        LambdaQueryWrapper<ReportLogBook> reportLogBookLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        reportLogBookLambdaQueryWrapper.eq(ReportLogBook::getReportId, reportId);
+        reportLogBookLambdaQueryWrapper.eq(ReportLogBook::getType, 3);
+        reportLogBookLambdaQueryWrapper.eq(ReportLogBook::getUserId, UserUtils.getUserId());
+        remove(reportLogBookLambdaQueryWrapper);
     }
 
     @Override
@@ -179,7 +184,7 @@ public class IReportLogBookServiceImpl extends ServiceImpl<ReportLogBookDao, Rep
             String logId = thumbUp(reportId);
             reportDetailThumbUpVo.setLogId(logId);
         } else {
-            thumbDown(entity.getId());
+            thumbDown(reportId);
         }
         //计算已有点赞数
         Integer count = getThumbUpCount(reportId);

From ef81234434cfe247a59c5a6690b73b47e6b6053b Mon Sep 17 00:00:00 2001
From: Mzaxd <caihaohan0712@foxmail.com>
Date: Tue, 9 May 2023 17:21:02 +0800
Subject: [PATCH 2/2] =?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<ReportDao, ReportEntity>
             });
         } 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);
+                    }
                 }
             });
         }