wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update springboot 升级 2.3.11 

update mybatis-plus 升级 3.4.3 分页Plus对象适配更新
This commit is contained in:
疯狂的狮子li 2021-05-21 11:50:47 +08:00
parent 3d25dfbebe
commit 97a237bbdc
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -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>

28
ruoyi-common/src/main/java/com/ruoyi/common/core/page/PagePlus.java
View File

@ -123,15 +123,27 @@ public class PagePlus<T,K> implements IPage<T> {
return this.optimizeCountSql;
}
@Override
public boolean isSearchCount() {
return this.total >= 0L && this.isSearchCount;
}
@Override
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);
}
}