Elgato_dark/sol-cloud
1
0
Fork 0
mirror of https://github.com/BgaSol/sol-cloud synced 2026-04-21 17:17:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor(base-service): use Page.of for pagination construction

Browse source
This commit is contained in:
sol 2026-04-15 16:19:20 +08:00
parent 28499a39c4
commit 5a40395754
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cloud/common/common-base-web/src/main/java/com/bgasol/common/core/base/service/BaseService.java
View file

@ -230,7 +230,7 @@ public abstract class BaseService<ENTITY extends BaseEntity, PAGE_DTO extends Ba
@Transactional(readOnly = true)
public PageVo<ENTITY> findByPage(PAGE_DTO pageDto, boolean otherData) {
// 构件分页查询条件
Page<ENTITY> page = new Page<>(pageDto.getPage(), pageDto.getSize());
Page<ENTITY> page = Page.of(pageDto.getPage(), pageDto.getSize());
// 查询关联的数据
Page<ENTITY> entityPage = this.findByPage(page, pageDto.getQueryWrapper(), otherData);
return PageVo.<ENTITY>builder().total(entityPage.getTotal()).page(entityPage.getCurrent()).size(entityPage.getSize()).result(entityPage.getRecords()).build();
@ -437,7 +437,7 @@ public abstract class BaseService<ENTITY extends BaseEntity, PAGE_DTO extends Ba
@Transactional(readOnly = true)
public PageVo<ENTITY> findByPage(Page<ENTITY> page, Wrapper<ENTITY> queryWrapper) {
// 查询关联的数据
Page<ENTITY> entityPage = this.findByPage(new Page<>(page.getPages(), page.getSize()), queryWrapper, true);
Page<ENTITY> entityPage = this.findByPage(Page.of(page.getCurrent(), page.getSize()), queryWrapper, true);
return PageVo.<ENTITY>builder()
.total(entityPage.getTotal())
.page(entityPage.getCurrent())