diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java
index 0eeffc07fa79974ccc6e1e9542e2518e60facb70..c9b263f94ba14ecc970935a508025d9ca729a9e3 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateController.java
@@ -6,6 +6,8 @@ import org.fuseri.model.dto.certificate.CertificateDto;
 import org.fuseri.model.dto.certificate.CertificateSimpleDto;
 import org.fuseri.model.dto.common.Result;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -91,7 +93,7 @@ public class CertificateController {
      * @return a Result object containing a list of CertificateDto objects and pagination information
      */
     @GetMapping("/findAll")
-    public Result<CertificateDto> findAllCertificates(@RequestParam int page) {
-        return new Result<>();
+    public Page<CertificateSimpleDto> findAllCertificates(Pageable pageable) {
+        return certificateFacade.findAll(pageable);
     }
 }
diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateFacade.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateFacade.java
index 53c25d1b4bf7ccf9232f2608b0d65f93d9f0186a..c57f97ae298ce97c216f52299d082cbda2d8ed82 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateFacade.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateFacade.java
@@ -49,10 +49,10 @@ public class CertificateFacade {
         return certificateMapper.mapToList(certificateService.findByUserIdAndCourseId(userId, courseId));
     }
 
-    //@Transactional(readOnly = true)
-    //public Page<CertificateDto> findAll(Pageable pageable) {
-        //return certificateMapper.mapToPageDto(certificateService.findAll(pageable));
-    //}
+    @Transactional(readOnly = true)
+    public Page<CertificateSimpleDto> findAll(Pageable pageable) {
+        return certificateMapper.mapToPageDto(certificateService.findAll(pageable));
+    }
 
     @Transactional
     public void deleteCertificate(Long certificateId) {
diff --git a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateMapper.java b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateMapper.java
index 024b8c09b92a11723d87f33f2dd7c2b3ed7dc47c..f6738c4428f97b4bb6cacf0b2806491aabf00e8b 100644
--- a/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateMapper.java
+++ b/application/module-certificate/src/main/java/org/fuseri/modulecertificate/service/CertificateMapper.java
@@ -44,7 +44,7 @@ public interface CertificateMapper {
 
     List<CertificateSimpleDto> mapToList(List<Certificate> certificates);
 
-    //default Page<CertificateDto> mapToPageDto(Page<Certificate> certificates) {
-        //return new PageImpl<>(mapToList(certificates.getContent()), certificates.getPageable(), certificates.getTotalPages());
-    //}
+    default Page<CertificateSimpleDto> mapToPageDto(Page<Certificate> certificates) {
+        return new PageImpl<>(mapToList(certificates.getContent()), certificates.getPageable(), certificates.getTotalPages());
+    }
 }