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 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 page = new Page<>(pageNo, pageSize);