ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-11-03 22:57:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0.x' into dev

Browse Source 
# Conflicts:
#	continew-admin-common/src/main/java/top/charles7c/cnadmin/common/base/BaseController.java
This commit is contained in:
Charles7c
2023-07-19 23:17:39 +08:00
parent 2022a535e9 4a8af1f72d
commit 668124591e
4 changed files with 30 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
continew-admin-common/src/main/java/top/charles7c/cnadmin/common/model/vo/PageDataVO.java
View File

@@ -55,7 +55,7 @@ public class PageDataVO<V> implements Serializable {
* 总记录数
*/
@Schema(description = "总记录数")
private Long total;
private int total;
/**
* 基于 MyBatis Plus 分页数据构建分页信息，并将源数据转换为指定类型数据
@@ -76,7 +76,7 @@ public class PageDataVO<V> implements Serializable {
}
PageDataVO<V> pageDataVO = new PageDataVO<>();
pageDataVO.setList(BeanUtil.copyToList(page.getRecords(), targetClass));
pageDataVO.setTotal(page.getTotal());
pageDataVO.setTotal((int) page.getTotal());
return pageDataVO;
}
@@ -95,7 +95,7 @@ public class PageDataVO<V> implements Serializable {
}
PageDataVO<V> pageDataVO = new PageDataVO<>();
pageDataVO.setList(page.getRecords());
pageDataVO.setTotal(page.getTotal());
pageDataVO.setTotal((int) page.getTotal());
return pageDataVO;
}
@@ -118,7 +118,7 @@ public class PageDataVO<V> implements Serializable {
return pageDataVO;
}
pageDataVO.setTotal((long)list.size());
pageDataVO.setTotal(list.size());
// 对列表数据进行分页
int fromIndex = (page - 1) * size;
int toIndex = page * size + size;