fix(分页工厂类): 当前页数错误

Author: LetChatIT

admin4j-dependencies/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.admin4j</groupId>
     <artifactId>admin4j-dependencies</artifactId>
-    <version>0.9.1</version>
+    <version>0.9.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>${project.artifactId}</name>
@@ -220,7 +220,7 @@
             <dependency>
                 <groupId>com.admin4j.framework</groupId>
                 <artifactId>web-spring-boot-starter</artifactId>
-                <version>${admin4j.version}</version>
+                <version>0.9.1</version>
             </dependency>
             <dependency>
                 <groupId>com.admin4j.framework</groupId>

web-spring-boot-starter/pom.xml

@@ -12,7 +12,8 @@
     <groupId>com.admin4j.framework</groupId>
     <artifactId>web-spring-boot-starter</artifactId>
     <name>${project.artifactId}</name>
-
+    <version>0.9.1</version>
+    
     <dependencies>
         <dependency>
             <groupId>com.alibaba</groupId>

web-spring-boot-starter/src/main/java/com/admin4j/framework/web/factory/CommonPageFactory.java

@@ -22,7 +22,7 @@ public static <T> CommonPage<T> ok(Page<T> pageInfo) {
         CommonPage.PageResultVO<T> pageResultVO = new CommonPage.PageResultVO<>();
 
         pageResultVO.setTotal(pageInfo.getTotal());
-        pageResultVO.setCurrent(pageInfo.getPages());
+        pageResultVO.setCurrent(pageInfo.getPageNum());
         pageResultVO.setSize(pageInfo.getPageSize());
         pageResultVO.setRecords(pageInfo);
 
@@ -39,7 +39,7 @@ public static <T> CommonPage<T> ok(List<T> list) {
         CommonPage.PageResultVO<T> pageResultVO = new CommonPage.PageResultVO<>();
 
         pageResultVO.setTotal(list.size());
-        pageResultVO.setCurrent(0);
+        pageResultVO.setCurrent(1);
         pageResultVO.setSize(list.size());
         pageResultVO.setRecords(list);
 
@@ -55,7 +55,7 @@ public static <T> CommonPage<T> ok(Page<?> pageInfo, List<T> list) {
         CommonPage.PageResultVO<T> pageResultVO = new CommonPage.PageResultVO<>();
 
         pageResultVO.setTotal(pageInfo.getTotal());
-        pageResultVO.setCurrent(pageInfo.getPages());
+        pageResultVO.setCurrent(pageInfo.getPageNum());
         pageResultVO.setSize(pageInfo.getPageSize());
         pageResultVO.setRecords(list);
 

web-spring-boot-starter/src/main/java/com/admin4j/framework/web/factory/CommonPageMpFactory.java

@@ -18,7 +18,7 @@ public static <T> CommonPage<T> ok(IPage<T> pageInfo) {
         CommonPage.PageResultVO<T> pageResultVO = new CommonPage.PageResultVO<>();
 
         pageResultVO.setTotal(pageInfo.getTotal());
-        pageResultVO.setCurrent(pageInfo.getPages());
+        pageResultVO.setCurrent(pageInfo.getCurrent());
         pageResultVO.setSize(pageInfo.getSize());
         pageResultVO.setRecords(pageInfo.getRecords());
 
@@ -34,7 +34,7 @@ public static <T> CommonPage<T> ok(List<T> list) {
         CommonPage.PageResultVO<T> pageResultVO = new CommonPage.PageResultVO<>();
 
         pageResultVO.setTotal(list.size());
-        pageResultVO.setCurrent(0);
+        pageResultVO.setCurrent(1);
         pageResultVO.setSize(list.size());
         pageResultVO.setRecords(list);
 
@@ -50,7 +50,7 @@ public static <T> CommonPage<T> ok(IPage<?> pageInfo, List<T> list) {
         CommonPage.PageResultVO<T> pageResultVO = new CommonPage.PageResultVO<>();
 
         pageResultVO.setTotal(pageInfo.getTotal());
-        pageResultVO.setCurrent(pageInfo.getPages());
+        pageResultVO.setCurrent(pageInfo.getCurrent());
         pageResultVO.setSize(pageInfo.getSize());
         pageResultVO.setRecords(list);