fix: 修复webpageinfo默认值丢失问题

hcframe-parent/hcframe-base/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>hcframe-base</artifactId>
-    <version>1.2.5.3.1-SNAPSHOT</version>
+    <version>1.2.5.3.2-SNAPSHOT</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/common/WebPageInfo.java

@@ -34,6 +34,7 @@ public class WebPageInfo implements Serializable {
             example="10",
             dataType = "Integer"
     )
+    @Builder.Default
     private Integer pageSize = 10;
 
     @ApiModelProperty(
@@ -41,6 +42,7 @@ public class WebPageInfo implements Serializable {
             example="1",
             dataType = "Integer"
     )
+    @Builder.Default
     private Integer pageNum = 1;
 
     @ApiModelProperty(value="排序字段")
@@ -50,6 +52,7 @@ public class WebPageInfo implements Serializable {
             value = "正序倒序",
             allowableValues = "asc,desc",
             example = "asc")
+    @Builder.Default
     private String order = ASC;
 
 
@@ -60,11 +63,13 @@ public class WebPageInfo implements Serializable {
     @ApiModelProperty(
             value = "开启分页缓存"
     )
+    @Builder.Default
     private boolean enableCache = false;
 
     @ApiModelProperty(
             value = "开启分页排序"
     )
+    @Builder.Default
     private boolean enableSort = true;
 
     public static boolean isSafeOrderBy(String orderBy) {

hcframe-parent/hcframe-base/src/main/java/com/taixingyiji/base/module/data/module/BaseMapperImpl.java

@@ -896,7 +896,7 @@ public class BaseMapperImpl implements BaseMapper {
                 if (map == null) {
                     tableMapper.createHighGoSequence(tableName.toLowerCase(), 1);
                 } else {
-                    tableMapper.createHighGoSequence(tableName.toLowerCase(), Long.parseLong(String.valueOf(map.get(pkName))) + 1);
+                    tableMapper.createHighGoSequence(tableName.toLowerCase(), map.get(pkName));
                 }
             }
             id = tableMapper.getHighGoSequence(tableName.toLowerCase());
@@ -914,7 +914,7 @@ public class BaseMapperImpl implements BaseMapper {
                 if (map == null) {
                     tableMapper.createSequence(tableName, 1);
                 } else {
-                    tableMapper.createSequence(tableName, Long.parseLong(String.valueOf(map.get(pkName))) + 1);
+                    tableMapper.createSequence(tableName, map.get(pkName));
                 }
                 id = tableMapper.getSequence(tableName);
             }