疯狂的狮子li
2021-05-21 97a237bbdc97b6ccf7be9011be6f9992eadb9462
update springboot 升级 2.3.11
update mybatis-plus 升级 3.4.3 分页Plus对象适配更新
已修改2个文件
26 ■■■■ 文件已修改
pom.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml
@@ -14,7 +14,7 @@
    <properties>
        <ruoyi-vue-plus.version>2.1.1</ruoyi-vue-plus.version>
        <spring-boot.version>2.3.10.RELEASE</spring-boot.version>
        <spring-boot.version>2.3.11.RELEASE</spring-boot.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>1.8</java.version>
@@ -26,7 +26,7 @@
        <poi.version>4.1.2</poi.version>
        <velocity.version>1.7</velocity.version>
        <jwt.version>0.9.1</jwt.version>
        <mybatis-plus.version>3.4.2</mybatis-plus.version>
        <mybatis-plus.version>3.4.3</mybatis-plus.version>
        <hutool.version>5.5.8</hutool.version>
        <feign.version>2.2.6.RELEASE</feign.version>
        <feign-okhttp.version>11.0</feign-okhttp.version>
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java
@@ -124,13 +124,25 @@
    }
    @Override
    public boolean isSearchCount() {
        return this.total >= 0L && this.isSearchCount;
    public long getPages() {
        // 解决 github issues/3208
        return IPage.super.getPages();
    }
    public PagePlus<T, K> setSearchCount(boolean isSearchCount) {
        this.isSearchCount = isSearchCount;
        return this;
    public static <T,K> PagePlus<T,K> of(long current, long size) {
        return of(current, size, 0);
    }
    public static <T,K> PagePlus<T,K> of(long current, long size, long total) {
        return of(current, size, total, true);
    }
    public static <T,K> PagePlus<T,K> of(long current, long size, boolean searchCount) {
        return of(current, size, 0, searchCount);
    }
    public static <T,K> PagePlus<T,K> of(long current, long size, long total, boolean searchCount) {
        return new PagePlus<>(current, size, total, searchCount);
    }
}