From b4373ab18960a697e2beabdd56b62a87785b5996 Mon Sep 17 00:00:00 2001 From: Carrierli Date: Tue, 17 Mar 2026 17:36:38 +0800 Subject: [PATCH] =?UTF-8?q?[mod]=E5=B0=86PageResult=E4=BB=8Ecommon-mybatis?= =?UTF-8?q?=E6=8C=AA=E5=88=B0common-core=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/domain}/PageResult.java | 28 ++++--------------- .../demo/controller/TestDemoController.java | 2 +- .../demo/service/ITestDemoService.java | 2 +- .../service/impl/TestDemoServiceImpl.java | 6 ++-- .../generator/controller/GenController.java | 2 +- .../service/GenTableServiceImpl.java | 12 ++++++-- .../generator/service/IGenTableService.java | 2 +- .../main/resources/vm/java/controller.java.vm | 2 +- .../main/resources/vm/java/service.java.vm | 2 +- .../resources/vm/java/serviceImpl.java.vm | 4 +-- .../monitor/SysLoginInfoController.java | 2 +- .../monitor/SysOperlogController.java | 2 +- .../monitor/SysUserOnlineController.java | 2 +- .../system/SysClientController.java | 2 +- .../system/SysConfigController.java | 2 +- .../system/SysDictDataController.java | 2 +- .../system/SysDictTypeController.java | 2 +- .../system/SysNoticeController.java | 2 +- .../system/SysOssConfigController.java | 2 +- .../controller/system/SysOssController.java | 2 +- .../controller/system/SysPostController.java | 2 +- .../controller/system/SysRoleController.java | 2 +- .../controller/system/SysUserController.java | 2 +- .../system/service/ISysClientService.java | 2 +- .../system/service/ISysConfigService.java | 2 +- .../system/service/ISysDeptService.java | 2 +- .../system/service/ISysDictDataService.java | 2 +- .../system/service/ISysDictTypeService.java | 2 +- .../system/service/ISysLoginInfoService.java | 2 +- .../system/service/ISysNoticeService.java | 2 +- .../system/service/ISysOperLogService.java | 2 +- .../system/service/ISysOssConfigService.java | 2 +- .../system/service/ISysOssService.java | 2 +- .../system/service/ISysPostService.java | 2 +- .../system/service/ISysRoleService.java | 2 +- .../system/service/ISysUserService.java | 2 +- .../service/impl/SysClientServiceImpl.java | 4 +-- .../service/impl/SysConfigServiceImpl.java | 4 +-- .../service/impl/SysDeptServiceImpl.java | 4 +-- .../service/impl/SysDictDataServiceImpl.java | 4 +-- .../service/impl/SysDictTypeServiceImpl.java | 4 +-- .../service/impl/SysLoginInfoServiceImpl.java | 4 +-- .../service/impl/SysNoticeServiceImpl.java | 4 +-- .../service/impl/SysOperLogServiceImpl.java | 4 +-- .../service/impl/SysOssConfigServiceImpl.java | 4 +-- .../service/impl/SysOssServiceImpl.java | 4 +-- .../service/impl/SysPostServiceImpl.java | 4 +-- .../service/impl/SysRoleServiceImpl.java | 4 +-- .../impl/SysTaskAssigneeServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 9 +++--- .../controller/FlwDefinitionController.java | 2 +- .../controller/FlwInstanceController.java | 2 +- .../controller/FlwSpelController.java | 2 +- .../controller/FlwTaskController.java | 2 +- .../controller/TestLeaveController.java | 2 +- .../service/IFlwDefinitionService.java | 2 +- .../workflow/service/IFlwInstanceService.java | 2 +- .../workflow/service/IFlwSpelService.java | 2 +- .../workflow/service/IFlwTaskService.java | 2 +- .../workflow/service/ITestLeaveService.java | 2 +- .../impl/FlwDefinitionServiceImpl.java | 2 +- .../service/impl/FlwInstanceServiceImpl.java | 8 +++--- .../service/impl/FlwSpelServiceImpl.java | 4 +-- .../service/impl/FlwTaskServiceImpl.java | 12 ++++---- .../service/impl/TestLeaveServiceImpl.java | 4 +-- 65 files changed, 105 insertions(+), 118 deletions(-) rename ruoyi-common/{ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page => ruoyi-common-core/src/main/java/org/dromara/common/core/domain}/PageResult.java (54%) diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageResult.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java similarity index 54% rename from ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageResult.java rename to ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java index c8ede31f4..dedc8b72b 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageResult.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/PageResult.java @@ -1,7 +1,5 @@ -package org.dromara.common.mybatis.core.page; +package org.dromara.common.core.domain; -import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.core.metadata.IPage; import lombok.Data; import lombok.NoArgsConstructor; @@ -45,10 +43,10 @@ public class PageResult implements Serializable { /** * 根据分页对象构建表格分页数据对象 */ - public static PageResult build(IPage page) { + public static PageResult build(List list, long total) { PageResult rspData = new PageResult<>(); - rspData.setRows(page.getRecords()); - rspData.setTotal(page.getTotal()); + rspData.setRows(list); + rspData.setTotal(total); return rspData; } @@ -66,23 +64,7 @@ public class PageResult implements Serializable { * 构建表格分页数据对象 */ public static PageResult build() { - PageResult rspData = new PageResult<>(); - return rspData; - } - - /** - * 根据原始数据列表和分页参数，构建表格分页数据对象（用于假分页） - * - * @param list 原始数据列表（全部数据） - * @param page 分页参数对象（包含当前页码、每页大小等） - * @return 构造好的分页结果 PageResult - */ - public static PageResult build(List list, IPage page) { - if (CollUtil.isEmpty(list)) { - return PageResult.build(); - } - List pageList = CollUtil.page((int) page.getCurrent() - 1, (int) page.getSize(), list); - return new PageResult<>(pageList, list.size()); + return new PageResult<>(); } } diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java index 92bc128c2..b91c4f80c 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java @@ -10,7 +10,7 @@ import org.dromara.common.core.validate.QueryGroup; import org.dromara.common.web.core.BaseController; import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java index cce0e803f..9575d12c2 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/ITestDemoService.java @@ -1,7 +1,7 @@ package org.dromara.demo.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.vo.TestDemoVo; diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java index eb5a7291d..5c4c29f68 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/TestDemoServiceImpl.java @@ -8,7 +8,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.demo.domain.TestDemo; import org.dromara.demo.domain.bo.TestDemoBo; import org.dromara.demo.domain.vo.TestDemoVo; @@ -54,7 +54,7 @@ public class TestDemoServiceImpl implements ITestDemoService { public PageResult queryPageList(TestDemoBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /** @@ -68,7 +68,7 @@ public class TestDemoServiceImpl implements ITestDemoService { public PageResult customPageList(TestDemoBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.customPageList(pageQuery.build(), lqw); - return PageResult.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java index e9b223e3e..d37248d24 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java @@ -11,7 +11,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.web.core.BaseController; import org.dromara.generator.domain.GenTable; diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java index b3949cb44..cd94cd250 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/GenTableServiceImpl.java @@ -26,7 +26,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.FileUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.utils.IdGeneratorUtil; import org.dromara.generator.constant.GenConstants; import org.dromara.generator.domain.GenTable; @@ -99,7 +99,7 @@ public class GenTableServiceImpl implements IGenTableService { @Override public PageResult selectPageGenTableList(GenTable genTable, PageQuery pageQuery) { Page page = baseMapper.selectPage(pageQuery.build(), this.buildGenTableQueryWrapper(genTable)); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -179,7 +179,13 @@ public class GenTableServiceImpl implements IGenTableService { return gen; }).sorted(Comparator.comparing(GenTable::getCreateTime).reversed()) .toList(); - return PageResult.build(tables, pageQuery.build()); + // 根据原始数据列表和分页参数，构建表格分页数据对象（用于假分页） + if (CollUtil.isEmpty(tables)) { + return PageResult.build(); + } + Page page = pageQuery.build(); + List pageList = CollUtil.page((int) page.getCurrent() - 1, (int) page.getSize(), tables); + return PageResult.build(pageList, tables.size()); } /** diff --git a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java index 845bb0a39..18f03c977 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java +++ b/ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/service/IGenTableService.java @@ -1,7 +1,7 @@ package org.dromara.generator.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.generator.domain.GenTable; import org.dromara.generator.domain.GenTableColumn; diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm index 4025a91e8..a43370e63 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm @@ -21,7 +21,7 @@ import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; import ${packageName}.service.I${ClassName}Service; #if($table.crud) -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; #elseif($table.tree) #end diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm index 27123330d..f3e18f435 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/service.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service; import ${packageName}.domain.vo.${ClassName}Vo; import ${packageName}.domain.bo.${ClassName}Bo; #if($table.crud) -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.page.PageQuery; #end diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm index 58e066b63..a92fb8758 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm @@ -3,7 +3,7 @@ package ${packageName}.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; #if($table.crud) -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.core.page.PageQuery; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; #end @@ -58,7 +58,7 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service { public PageResult<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery) { LambdaQueryWrapper<${ClassName}> lqw = buildQueryWrapper(bo); Page<${ClassName}Vo> result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } #end diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java index 22d6814e6..2db084ba9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java @@ -11,7 +11,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysLoginInfoBo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java index ec5fae120..2654dbf85 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java @@ -9,7 +9,7 @@ import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java index d18195c6b..47f2bb0dc 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java @@ -13,7 +13,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.SysUserOnline; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java index 9c9cd4c7a..83806b63a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java @@ -13,7 +13,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java index ede377e5c..c424029e7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java @@ -9,7 +9,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysConfigBo; import org.dromara.system.domain.vo.SysConfigVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java index bc6d3c03d..6de84099f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java @@ -10,7 +10,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java index aa1d20b63..4d553cc6f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java @@ -10,7 +10,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDictTypeBo; import org.dromara.system.domain.vo.SysDictTypeVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java index 3e69d8f76..fcc3f459a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java @@ -8,7 +8,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.sse.utils.SseMessageUtils; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysNoticeBo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java index 13910b4a4..6664cc610 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java @@ -10,7 +10,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysOssConfigBo; import org.dromara.system.domain.vo.SysOssConfigVo; import org.dromara.system.service.ISysOssConfigService; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java index fcf853d0a..9fbf71e39 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java @@ -10,7 +10,7 @@ import org.dromara.common.core.validate.QueryGroup; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysOssBo; import org.dromara.system.domain.vo.SysOssUploadVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java index 70bebba75..7ac0253ee 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java @@ -12,7 +12,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.bo.SysPostBo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java index 557ed2675..e247eceb0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -10,7 +10,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysDeptBo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index f9db651f4..1349ab125 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -20,7 +20,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.helper.DataPermissionHelper; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.web.core.BaseController; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java index 353be82d9..b865c9c13 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysClientService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java index f59714aab..1f19d2794 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysConfigService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysConfigBo; import org.dromara.system.domain.vo.SysConfigVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java index 4b703f157..63c33be1c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDeptService.java @@ -2,7 +2,7 @@ package org.dromara.system.service; import cn.hutool.core.lang.tree.Tree; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.vo.SysDeptVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java index 6677ecfe0..f3bd769ac 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictDataService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysDictDataBo; import org.dromara.system.domain.vo.SysDictDataVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java index 490521549..1eac2c429 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysDictTypeService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysDictTypeBo; import org.dromara.system.domain.vo.SysDictDataVo; import org.dromara.system.domain.vo.SysDictTypeVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java index fff5fb6f0..c3f0100b0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysLoginInfoService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysLoginInfoBo; import org.dromara.system.domain.vo.SysLoginInfoVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java index d4f39e48b..81ec4c592 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysNoticeService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysNoticeBo; import org.dromara.system.domain.vo.SysNoticeVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java index ec37df673..51c7e95f9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOperLogService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java index 2251bed9d..844d699a8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssConfigService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysOssConfigBo; import org.dromara.system.domain.vo.SysOssConfigVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java index d77aacd38..78eb473df 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysOssBo; import org.dromara.system.domain.vo.SysOssVo; import jakarta.servlet.http.HttpServletResponse; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java index ba895797e..2ada75334 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysPostService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.vo.SysPostVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java index 64fed1cd0..a34fc1c55 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysRoleService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysUserRole; import org.dromara.system.domain.bo.SysRoleBo; import org.dromara.system.domain.vo.SysRoleVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java index 917112873..a054e4168 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysUserService.java @@ -1,7 +1,7 @@ package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysUserBo; import org.dromara.system.domain.vo.SysUserExportVo; import org.dromara.system.domain.vo.SysUserVo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java index c695a0efc..1724d7a98 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysClientServiceImpl.java @@ -13,7 +13,7 @@ import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysClient; import org.dromara.system.domain.bo.SysClientBo; import org.dromara.system.domain.vo.SysClientVo; @@ -76,7 +76,7 @@ public class SysClientServiceImpl implements ISysClientService { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); result.getRecords().forEach(r -> r.setGrantTypeList(StringUtils.splitList(r.getGrantType()))); - return PageResult.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java index 72ea97559..c0339c2b3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysConfigServiceImpl.java @@ -17,7 +17,7 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysConfig; import org.dromara.system.domain.bo.SysConfigBo; @@ -53,7 +53,7 @@ public class SysConfigServiceImpl implements ISysConfigService, ConfigService { public PageResult selectPageConfigList(SysConfigBo config, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(config); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java index 24ff1c6bd..4b826f3c8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java @@ -17,7 +17,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.DeptService; import org.dromara.common.core.utils.*; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.satoken.utils.LoginHelper; @@ -61,7 +61,7 @@ public class SysDeptServiceImpl implements ISysDeptService, DeptService { @Override public PageResult selectPageDeptList(SysDeptBo dept, PageQuery pageQuery) { Page page = baseMapper.selectPageDeptList(pageQuery.build(), buildQueryWrapper(dept)); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java index 976a32294..c99badc35 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictDataServiceImpl.java @@ -10,7 +10,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysDictData; import org.dromara.system.domain.bo.SysDictDataBo; @@ -44,7 +44,7 @@ public class SysDictDataServiceImpl implements ISysDictDataService { public PageResult selectPageDictDataList(SysDictDataBo dictData, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(dictData); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java index 831c0a196..e801aaaea 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDictTypeServiceImpl.java @@ -18,7 +18,7 @@ import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysDictData; import org.dromara.system.domain.SysDictType; @@ -59,7 +59,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService, DictService public PageResult selectPageDictTypeList(SysDictTypeBo dictType, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(dictType); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java index 3b2aaa76f..ff3d97502 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysLoginInfoServiceImpl.java @@ -15,7 +15,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ip.AddressUtils; import org.dromara.common.log.event.LoginInfoEvent; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysLoginInfo; import org.dromara.system.domain.bo.SysLoginInfoBo; @@ -133,7 +133,7 @@ public class SysLoginInfoServiceImpl implements ISysLoginInfoService { lqw.orderByDesc(SysLoginInfo::getInfoId); } Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java index 64e1d3ba4..36d0a367a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysNoticeServiceImpl.java @@ -8,7 +8,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysNotice; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.bo.SysNoticeBo; @@ -45,7 +45,7 @@ public class SysNoticeServiceImpl implements ISysNoticeService { public PageResult selectPageNoticeList(SysNoticeBo notice, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(notice); Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java index 0b2e6adeb..4f9722c01 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOperLogServiceImpl.java @@ -9,7 +9,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.ip.AddressUtils; import org.dromara.common.log.event.OperLogEvent; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysOperLog; import org.dromara.system.domain.bo.SysOperLogBo; import org.dromara.system.domain.vo.SysOperLogVo; @@ -63,7 +63,7 @@ public class SysOperLogServiceImpl implements ISysOperLogService { lqw.orderByDesc(SysOperLog::getOperId); } Page page = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java index d589b0418..996331ea0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssConfigServiceImpl.java @@ -15,7 +15,7 @@ import org.dromara.common.core.utils.ObjectUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.oss.constant.OssConstant; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.redis.utils.RedisUtils; @@ -82,7 +82,7 @@ public class SysOssConfigServiceImpl implements ISysOssConfigService { public PageResult queryPageList(SysOssConfigBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java index f8e516fd6..949d77a7d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -19,7 +19,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.FileUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.entity.UploadResult; import org.dromara.common.oss.enums.AccessPolicyType; @@ -68,7 +68,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); List filterResult = StreamUtils.toList(result.getRecords(), this::matchingUrl); result.setRecords(filterResult); - return PageResult.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java index 34354393b..1e1256281 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysPostServiceImpl.java @@ -13,7 +13,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.SysPost; import org.dromara.system.domain.SysUserPost; import org.dromara.system.domain.bo.SysPostBo; @@ -51,7 +51,7 @@ public class SysPostServiceImpl implements ISysPostService, PostService { @Override public PageResult selectPagePostList(SysPostBo post, PageQuery pageQuery) { Page page = baseMapper.selectPagePostList(pageQuery.build(), buildQueryWrapper(post)); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java index f04f8002b..c9668e30b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysRoleServiceImpl.java @@ -20,7 +20,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysRole; import org.dromara.system.domain.SysRoleDept; @@ -63,7 +63,7 @@ public class SysRoleServiceImpl implements ISysRoleService, RoleService { @Override public PageResult selectPageRoleList(SysRoleBo role, PageQuery pageQuery) { Page page = baseMapper.selectPageRoleList(pageQuery.build(), this.buildQueryWrapper(role)); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java index 4454239c8..dbd743c86 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTaskAssigneeServiceImpl.java @@ -7,7 +7,7 @@ import org.dromara.common.core.domain.dto.TaskAssigneeDTO; import org.dromara.common.core.domain.model.TaskAssigneeBody; import org.dromara.common.core.service.TaskAssigneeService; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.system.domain.bo.SysDeptBo; import org.dromara.system.domain.bo.SysPostBo; import org.dromara.system.domain.bo.SysRoleBo; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java index fb7eda884..9370d49c1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysUserServiceImpl.java @@ -7,7 +7,6 @@ import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -20,7 +19,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.service.UserService; import org.dromara.common.core.utils.*; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.system.domain.SysUser; import org.dromara.system.domain.SysUserPost; @@ -66,7 +65,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public PageResult selectPageUserList(SysUserBo user, PageQuery pageQuery) { Page page = baseMapper.selectPageUserList(pageQuery.build(), this.buildQueryWrapper(user)); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -118,7 +117,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { @Override public PageResult selectAllocatedList(SysUserBo user, PageQuery pageQuery) { Page page = baseMapper.selectAllocatedList(pageQuery.build(), user); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -131,7 +130,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService { public PageResult selectUnallocatedList(SysUserBo user, PageQuery pageQuery) { List userIds = userRoleMapper.selectUserIdsByRoleId(user.getRoleId()); Page page = baseMapper.selectUnallocatedList(pageQuery.build(), user, userIds); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index 9e90b5782..02bd05305 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -7,7 +7,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Definition; import org.dromara.warm.flow.core.service.DefService; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index dcb1c4075..36369296b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -8,7 +8,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.service.InsService; import org.dromara.workflow.common.ConditionalOnEnable; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java index 6d716bfff..3c1aaeb5c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java @@ -11,7 +11,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.bo.FlowSpelBo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index 10d52146c..aed9fb985 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -9,7 +9,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.orm.entity.FlowNode; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java index 2bd9c7d1d..ce46e9272 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java @@ -13,7 +13,7 @@ import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.web.core.BaseController; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.bo.TestLeaveBo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java index 7a745afe2..695228136 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwDefinitionService.java @@ -2,7 +2,7 @@ package org.dromara.workflow.service; import jakarta.servlet.http.HttpServletResponse; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.orm.entity.FlowDefinition; import org.dromara.workflow.domain.vo.FlowDefinitionVo; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java index d6541ac27..6e20abe3d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwInstanceService.java @@ -1,7 +1,7 @@ package org.dromara.workflow.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.orm.entity.FlowInstance; import org.dromara.workflow.domain.bo.FlowCancelBo; import org.dromara.workflow.domain.bo.FlowInstanceBo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java index 0ff6eb243..53bfec40e 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwSpelService.java @@ -3,7 +3,7 @@ package org.dromara.workflow.service; import org.dromara.common.core.domain.dto.TaskAssigneeDTO; import org.dromara.common.core.domain.model.TaskAssigneeBody; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.domain.bo.FlowSpelBo; import org.dromara.workflow.domain.vo.FlowSpelVo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java index 3c73ce516..55758874d 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IFlwTaskService.java @@ -3,7 +3,7 @@ package org.dromara.workflow.service; import org.dromara.common.core.domain.dto.StartProcessReturnDTO; import org.dromara.common.core.domain.dto.UserDTO; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.core.entity.Node; import org.dromara.warm.flow.core.entity.Task; import org.dromara.warm.flow.orm.entity.FlowHisTask; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java index 7b5b42450..7ed779a6b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/ITestLeaveService.java @@ -1,7 +1,7 @@ package org.dromara.workflow.service; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.domain.bo.TestLeaveBo; import org.dromara.workflow.domain.vo.TestLeaveVo; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java index 41a413462..02fc79ede 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwDefinitionServiceImpl.java @@ -15,7 +15,7 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.warm.flow.core.dto.DefJson; import org.dromara.warm.flow.core.enums.NodeType; import org.dromara.warm.flow.core.enums.PublishStatus; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java index 7df12d5f0..f9610dddb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwInstanceServiceImpl.java @@ -16,7 +16,7 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.FlowEngine; import org.dromara.warm.flow.core.constant.ExceptionCons; @@ -87,7 +87,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { MPJLambdaWrapper queryWrapper = buildQueryWrapper(flowInstanceBo); queryWrapper.in("fi", FlowInstance::getFlowStatus, BusinessStatusEnum.runningStatus()); Page page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -102,7 +102,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { MPJLambdaWrapper queryWrapper = buildQueryWrapper(flowInstanceBo); queryWrapper.in("fi", FlowInstance::getFlowStatus, BusinessStatusEnum.finishStatus()); Page page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -344,7 +344,7 @@ public class FlwInstanceServiceImpl implements IFlwInstanceService { MPJLambdaWrapper queryWrapper = buildQueryWrapper(instanceBo); queryWrapper.eq("fi", FlowInstance::getCreateBy, LoginHelper.getUserIdStr()); Page page = flwInstanceMapper.selectInstanceList(pageQuery.build(), queryWrapper); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java index 3d025d0e6..a5e506522 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwSpelServiceImpl.java @@ -15,7 +15,7 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.domain.FlowSpel; import org.dromara.workflow.domain.bo.FlowSpelBo; @@ -65,7 +65,7 @@ public class FlwSpelServiceImpl implements IFlwSpelService { public PageResult queryPageList(FlowSpelBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java index 1df44fb91..3e248f02c 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwTaskServiceImpl.java @@ -23,7 +23,7 @@ import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.json.utils.JsonUtils; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.common.mybatis.utils.IdGeneratorUtil; import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.warm.flow.core.FlowEngine; @@ -381,7 +381,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { public PageResult pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { Page page = flwTaskMapper.getListRunTask(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), LoginHelper.getUserIdStr()); this.wrapAssigneeInfo(page.getRecords()); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -394,7 +394,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { @Override public PageResult pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { Page page = flwHisTaskMapper.getListFinishTask(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), LoginHelper.getUserIdStr()); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -408,7 +408,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { public PageResult pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { Page page = flwTaskMapper.getListRunTask(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), null); this.wrapAssigneeInfo(page.getRecords()); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -439,7 +439,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { @Override public PageResult pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { Page page = flwHisTaskMapper.getListFinishTask(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), null); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** @@ -452,7 +452,7 @@ public class FlwTaskServiceImpl implements IFlwTaskService { @Override public PageResult pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { Page page = flwTaskMapper.getTaskCopyByPage(pageQuery.build(), flowTaskBo, categoryIds(flowTaskBo), LoginHelper.getUserIdStr()); - return PageResult.build(page); + return PageResult.build(page.getRecords(), page.getTotal()); } /** diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java index c20eb4f7a..ddb69007b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java @@ -22,7 +22,7 @@ import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.PageResult; +import org.dromara.common.core.domain.PageResult; import org.dromara.workflow.common.ConditionalOnEnable; import org.dromara.workflow.common.constant.FlowConstant; import org.dromara.workflow.domain.TestLeave; @@ -87,7 +87,7 @@ public class TestLeaveServiceImpl implements ITestLeaveService { public PageResult queryPageList(TestLeaveBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); - return PageResult.build(result); + return PageResult.build(result.getRecords(), result.getTotal()); } /**