diff --git a/dsms-engine-application/src/test/java/com/dsms/common/util/PageUtilTest.java b/dsms-engine-application/src/test/java/com/dsms/common/util/PageUtilTest.java
index 5a9e4fb52dade14bf5af4f04d88cb9e9321fc2c9..53f5be9af5c1b0db182e7f21a61571ce1201407d 100644
--- a/dsms-engine-application/src/test/java/com/dsms/common/util/PageUtilTest.java
+++ b/dsms-engine-application/src/test/java/com/dsms/common/util/PageUtilTest.java
@@ -2,15 +2,17 @@ package com.dsms.common.util;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dsms.common.taskmanager.model.Task;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import org.junit.jupiter.api.Test;
 
 class PageUtilTest {
 
     @Test
-    public void testPageUtil() {
+    void testPageUtil() {
         List<Task> tasks = new ArrayList<>();
         int pageSize = 10;
 
@@ -21,4 +23,29 @@ class PageUtilTest {
         assertEquals(pageSize, pagedTask.size());
     }
 
+    @Test
+    void testPageUtilEmpty() {
+        List<Task> tasks = new ArrayList<>();
+        int pageSize = 10;
+
+        for (int i = 0; i < pageSize + 1; i++) {
+            tasks.add(new Task());
+        }
+        List<Task> pagedTask = PageUtil.pageData(tasks, 3, pageSize);
+        assertEquals(Collections.emptyList(), pagedTask);
+    }
+
+    @Test
+    void testGetPageData() {
+        List<Task> tasks = new ArrayList<>();
+        int pageSize = 10;
+
+        for (int i = 0; i < pageSize + 1; i++) {
+            tasks.add(new Task());
+        }
+        Page<Task> pageData = PageUtil.getPageData(tasks, 1, pageSize);
+        assertEquals(pageSize + 1, pageData.getTotal());
+        assertEquals(pageSize, pageData.getRecords().size());
+    }
+
 }
\ No newline at end of file
diff --git a/dsms-engine-common/src/main/java/com/dsms/common/util/PageUtil.java b/dsms-engine-common/src/main/java/com/dsms/common/util/PageUtil.java
index 9ebcd348bab34fa4cf51f40decbc56e7bd0cc17b..aedfd5a157c79b42309a767a85393884d2cc3545 100644
--- a/dsms-engine-common/src/main/java/com/dsms/common/util/PageUtil.java
+++ b/dsms-engine-common/src/main/java/com/dsms/common/util/PageUtil.java
@@ -22,7 +22,10 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class PageUtil<T> {
+public class PageUtil {
+
+    private PageUtil() {
+    }
 
     /**
      * Pages data with pageNo and pageSize