From ced8c3f67c96da670d41653c6bebf8e7dc55c3f1 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 12 Aug 2024 19:40:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2088501=20=E6=B3=95=E8=A7=84=E7=AC=A6?=
 =?UTF-8?q?=E5=90=88=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93--=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=81=9A=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/LawsConformityAssessmentLibraryServiceImpl.java       | 2 +-
 .../service/impl/LawsEvaluationNotMetLibraryServiceImpl.java   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
index bcfce97b..44f35b87 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsConformityAssessmentLibraryServiceImpl.java
@@ -316,7 +316,7 @@ public class LawsConformityAssessmentLibraryServiceImpl extends ServiceImpl<Laws
     @Override
     public boolean noAdminAuth() {
         LoginUser currentUser = UserUtils.getCurrentUser();
-        return !Stream.of(currentUser.getRoleIds()).noneMatch(roleId -> roleId.equals(lawsAdmin) || roleId.equals(superAdmin));
+        return Stream.of(currentUser.getRoleIds()).noneMatch(roleId -> roleId.equals(lawsAdmin) || roleId.equals(superAdmin));
     }
 
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
index eb18b498..c2e9e0e8 100644
--- a/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/assessmentLibrary/service/impl/LawsEvaluationNotMetLibraryServiceImpl.java
@@ -76,8 +76,7 @@ public class LawsEvaluationNotMetLibraryServiceImpl extends ServiceImpl<LawsEval
         }
         if (calService.noAdminAuth()) {
             String userId = UserUtils.getUserId();
-            queryWrapper.like("nm.all_approval_user", userId);
-            queryWrapper.like("nm.assessor", userId);
+            queryWrapper.like("nm.all_approval_user", userId).or().like("nm.assessor", userId);
         }
         queryWrapper.orderByDesc("nm.create_time");
         Page<LawsEvaluationNotMetLibrary> page = new Page<>(pageNo, pageSize);