From bba6e25539bdacd7fa77feb1eea6e2422ceee84e Mon Sep 17 00:00:00 2001 From: Carrierli Date: Tue, 17 Mar 2026 16:36:34 +0800 Subject: [PATCH] =?UTF-8?q?[mod]=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BD=BF=E7=94=A8R=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=EF=BC=9A=E6=95=B0=E6=8D=AE=E6=94=BE=E5=85=A5?= =?UTF-8?q?data=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/core/page/TableDataInfo.java | 18 ----------------- .../demo/controller/TestDemoController.java | 8 ++++---- .../generator/controller/GenController.java | 12 +++++------ .../main/resources/vm/java/controller.java.vm | 4 ++-- .../src/main/resources/vm/ts/api.ts.vm | 3 ++- .../src/main/resources/vm/vue/index.vue.vm | 4 ++-- .../monitor/SysLoginInfoController.java | 4 ++-- .../monitor/SysOperlogController.java | 4 ++-- .../monitor/SysUserOnlineController.java | 8 ++++---- .../system/SysClientController.java | 4 ++-- .../system/SysConfigController.java | 4 ++-- .../system/SysDictDataController.java | 4 ++-- .../system/SysDictTypeController.java | 4 ++-- .../system/SysNoticeController.java | 4 ++-- .../system/SysOssConfigController.java | 4 ++-- .../controller/system/SysOssController.java | 4 ++-- .../controller/system/SysPostController.java | 4 ++-- .../controller/system/SysRoleController.java | 12 +++++------ .../controller/system/SysUserController.java | 4 ++-- .../controller/FlwDefinitionController.java | 8 ++++---- .../controller/FlwInstanceController.java | 12 +++++------ .../controller/FlwSpelController.java | 4 ++-- .../controller/FlwTaskController.java | 20 +++++++++---------- .../controller/TestLeaveController.java | 4 ++-- 24 files changed, 72 insertions(+), 89 deletions(-) diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java index 1fe2b3ef1..69c1fcdc2 100644 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java +++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java @@ -32,16 +32,6 @@ public class TableDataInfo implements Serializable { */ private List rows; - /** - * 消息状态码 - */ - private int code; - - /** - * 消息内容 - */ - private String msg; - /** * 分页 * @@ -51,8 +41,6 @@ public class TableDataInfo implements Serializable { public TableDataInfo(List list, long total) { this.rows = list; this.total = total; - this.code = HttpStatus.HTTP_OK; - this.msg = "查询成功"; } /** @@ -60,8 +48,6 @@ public class TableDataInfo implements Serializable { */ public static TableDataInfo build(IPage page) { TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); rspData.setRows(page.getRecords()); rspData.setTotal(page.getTotal()); return rspData; @@ -72,8 +58,6 @@ public class TableDataInfo implements Serializable { */ public static TableDataInfo build(List list) { TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); rspData.setRows(list); rspData.setTotal(list.size()); return rspData; @@ -84,8 +68,6 @@ public class TableDataInfo implements Serializable { */ public static TableDataInfo build() { TableDataInfo rspData = new TableDataInfo<>(); - rspData.setCode(HttpStatus.HTTP_OK); - rspData.setMsg("查询成功"); return rspData; } 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 eca329c68..3bfa1b3bf 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 @@ -52,8 +52,8 @@ public class TestDemoController extends BaseController { */ @SaCheckPermission("demo:demo:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { - return testDemoService.queryPageList(bo, pageQuery); + public R> list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { + return R.ok(testDemoService.queryPageList(bo, pageQuery)); } /** @@ -61,8 +61,8 @@ public class TestDemoController extends BaseController { */ @SaCheckPermission("demo:demo:list") @GetMapping("/page") - public TableDataInfo page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { - return testDemoService.customPageList(bo, pageQuery); + public R> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) { + return R.ok(testDemoService.customPageList(bo, pageQuery)); } /** 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 1bb8f949c..960b61a1d 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 @@ -47,8 +47,8 @@ public class GenController extends BaseController { */ @SaCheckPermission("tool:gen:list") @GetMapping("/list") - public TableDataInfo genList(GenTable genTable, PageQuery pageQuery) { - return genTableService.selectPageGenTableList(genTable, pageQuery); + public R> genList(GenTable genTable, PageQuery pageQuery) { + return R.ok(genTableService.selectPageGenTableList(genTable, pageQuery)); } /** @@ -80,8 +80,8 @@ public class GenController extends BaseController { */ @SaCheckPermission("tool:gen:list") @GetMapping("/db/list") - public TableDataInfo dataList(GenTable genTable, PageQuery pageQuery) { - return genTableService.selectPageDbTableList(genTable, pageQuery); + public R> dataList(GenTable genTable, PageQuery pageQuery) { + return R.ok(genTableService.selectPageDbTableList(genTable, pageQuery)); } /** @@ -92,9 +92,9 @@ public class GenController extends BaseController { */ @SaCheckPermission("tool:gen:list") @GetMapping(value = "/column/{tableId}") - public TableDataInfo columnList(@PathVariable("tableId") Long tableId) { + public R> columnList(@PathVariable("tableId") Long tableId) { List list = genTableService.selectGenTableColumnListByTableId(tableId); - return TableDataInfo.build(list); + return R.ok(TableDataInfo.build(list)); } /** 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 64389717d..e9b525970 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 @@ -45,8 +45,8 @@ public class ${ClassName}Controller extends BaseController { @SaCheckPermission("${permissionPrefix}:list") @GetMapping("/list") #if($table.crud) - public TableDataInfo<${ClassName}Vo> list(${ClassName}Bo bo, PageQuery pageQuery) { - return ${className}Service.queryPageList(bo, pageQuery); + public R> list(${ClassName}Bo bo, PageQuery pageQuery) { + return R.ok(${className}Service.queryPageList(bo, pageQuery)); } #elseif($table.tree) public R> list(${ClassName}Bo bo) { diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm index 3aa4a5f6d..a8f2230c8 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm @@ -1,6 +1,7 @@ import request from '@/utils/request'; import { AxiosPromise } from 'axios'; import { ${BusinessName}VO, ${BusinessName}Form, ${BusinessName}Query } from '@/api/${moduleName}/${businessName}/types'; +import { PageResult } from '@/api/types'; /** * 查询${functionName}列表 @@ -8,7 +9,7 @@ import { ${BusinessName}VO, ${BusinessName}Form, ${BusinessName}Query } from '@/ * @returns {*} */ -export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise<${BusinessName}VO[]> => { +export const list${BusinessName} = (query?: ${BusinessName}Query): AxiosPromise> => { return request({ url: '/${moduleName}/${businessName}/list', method: 'get', diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 1e06d7ada..30a8dc1a7 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -351,8 +351,8 @@ const getList = async () => { #end #end const res = await list${BusinessName}(queryParams.value); - ${businessName}List.value = res.rows; - total.value = res.total; + ${businessName}List.value = res.data?.rows; + total.value = res.data?.total; loading.value = false; } 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 6d9e4a60a..2fc1184fc 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 @@ -44,8 +44,8 @@ public class SysLoginInfoController extends BaseController { */ @SaCheckPermission("monitor:logininfo:list") @GetMapping("/list") - public TableDataInfo list(SysLoginInfoBo loginInfo, PageQuery pageQuery) { - return loginInfoService.selectPageLoginInfoList(loginInfo, pageQuery); + public R> list(SysLoginInfoBo loginInfo, PageQuery pageQuery) { + return R.ok(loginInfoService.selectPageLoginInfoList(loginInfo, pageQuery)); } /** 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 2bc6ff27b..ccfeabcee 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 @@ -41,8 +41,8 @@ public class SysOperlogController extends BaseController { */ @SaCheckPermission("monitor:operlog:list") @GetMapping("/list") - public TableDataInfo list(SysOperLogBo operLog, PageQuery pageQuery) { - return operLogService.selectPageOperLogList(operLog, pageQuery); + public R> list(SysOperLogBo operLog, PageQuery pageQuery) { + return R.ok(operLogService.selectPageOperLogList(operLog, pageQuery)); } /** 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 898bc2ca9..6dc02ae72 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 @@ -44,7 +44,7 @@ public class SysUserOnlineController extends BaseController { */ @SaCheckPermission("monitor:online:list") @GetMapping("/list") - public TableDataInfo list(String ipaddr, String userName) { + public R> list(String ipaddr, String userName) { // 获取所有未过期的 token Collection keys = RedisUtils.keys(CacheConstants.ONLINE_TOKEN_KEY + "*"); List userOnlineDTOList = new ArrayList<>(); @@ -73,7 +73,7 @@ public class SysUserOnlineController extends BaseController { Collections.reverse(userOnlineDTOList); userOnlineDTOList.removeAll(Collections.singleton(null)); List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); - return TableDataInfo.build(userOnlineList); + return R.ok(TableDataInfo.build(userOnlineList)); } /** @@ -100,7 +100,7 @@ public class SysUserOnlineController extends BaseController { * @return 当前用户在线设备列表 */ @GetMapping() - public TableDataInfo getInfo() { + public R> getInfo() { // 获取指定账号 id 的 token 集合 List tokenIds = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString()); List userOnlineDTOList = tokenIds.stream() @@ -111,7 +111,7 @@ public class SysUserOnlineController extends BaseController { Collections.reverse(userOnlineDTOList); userOnlineDTOList.removeAll(Collections.singleton(null)); List userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class); - return TableDataInfo.build(userOnlineList); + return R.ok(TableDataInfo.build(userOnlineList)); } /** 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 c59504f57..7858fb378 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 @@ -46,8 +46,8 @@ public class SysClientController extends BaseController { */ @SaCheckPermission("system:client:list") @GetMapping("/list") - public TableDataInfo list(SysClientBo bo, PageQuery pageQuery) { - return sysClientService.queryPageList(bo, pageQuery); + public R> list(SysClientBo bo, PageQuery pageQuery) { + return R.ok(sysClientService.queryPageList(bo, pageQuery)); } /** 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 57e549c2f..73e1d7a92 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 @@ -42,8 +42,8 @@ public class SysConfigController extends BaseController { */ @SaCheckPermission("system:config:list") @GetMapping("/list") - public TableDataInfo list(SysConfigBo config, PageQuery pageQuery) { - return configService.selectPageConfigList(config, pageQuery); + public R> list(SysConfigBo config, PageQuery pageQuery) { + return R.ok(configService.selectPageConfigList(config, pageQuery)); } /** 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 d92c40a89..ba427ccd1 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 @@ -46,8 +46,8 @@ public class SysDictDataController extends BaseController { */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public TableDataInfo list(SysDictDataBo dictData, PageQuery pageQuery) { - return dictDataService.selectPageDictDataList(dictData, pageQuery); + public R> list(SysDictDataBo dictData, PageQuery pageQuery) { + return R.ok(dictDataService.selectPageDictDataList(dictData, pageQuery)); } /** 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 4f91f5211..51429d0d4 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 @@ -43,8 +43,8 @@ public class SysDictTypeController extends BaseController { */ @SaCheckPermission("system:dict:list") @GetMapping("/list") - public TableDataInfo list(SysDictTypeBo dictType, PageQuery pageQuery) { - return dictTypeService.selectPageDictTypeList(dictType, pageQuery); + public R> list(SysDictTypeBo dictType, PageQuery pageQuery) { + return R.ok(dictTypeService.selectPageDictTypeList(dictType, pageQuery)); } /** 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 8a655e561..502b32ade 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 @@ -40,8 +40,8 @@ public class SysNoticeController extends BaseController { */ @SaCheckPermission("system:notice:list") @GetMapping("/list") - public TableDataInfo list(SysNoticeBo notice, PageQuery pageQuery) { - return noticeService.selectPageNoticeList(notice, pageQuery); + public R> list(SysNoticeBo notice, PageQuery pageQuery) { + return R.ok(noticeService.selectPageNoticeList(notice, pageQuery)); } /** 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 6cba16386..40973ceaf 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 @@ -46,8 +46,8 @@ public class SysOssConfigController extends BaseController { */ @SaCheckPermission("system:ossConfig:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { - return ossConfigService.queryPageList(bo, pageQuery); + public R> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) { + return R.ok(ossConfigService.queryPageList(bo, pageQuery)); } /** 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 82d8397a4..c1154a2e7 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 @@ -47,8 +47,8 @@ public class SysOssController extends BaseController { */ @SaCheckPermission("system:oss:list") @GetMapping("/list") - public TableDataInfo list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { - return ossService.queryPageList(bo, pageQuery); + public R> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { + return R.ok(ossService.queryPageList(bo, pageQuery)); } /** 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 43bd55389..51e3a4ea4 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 @@ -49,8 +49,8 @@ public class SysPostController extends BaseController { */ @SaCheckPermission("system:post:list") @GetMapping("/list") - public TableDataInfo list(SysPostBo post, PageQuery pageQuery) { - return postService.selectPagePostList(post, pageQuery); + public R> list(SysPostBo post, PageQuery pageQuery) { + return R.ok(postService.selectPagePostList(post, pageQuery)); } /** 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 17700be01..c97ed8099 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 @@ -50,8 +50,8 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/list") - public TableDataInfo list(SysRoleBo role, PageQuery pageQuery) { - return roleService.selectPageRoleList(role, pageQuery); + public R> list(SysRoleBo role, PageQuery pageQuery) { + return R.ok(roleService.selectPageRoleList(role, pageQuery)); } /** @@ -202,8 +202,8 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/authUser/allocatedList") - public TableDataInfo allocatedList(SysUserBo user, PageQuery pageQuery) { - return userService.selectAllocatedList(user, pageQuery); + public R> allocatedList(SysUserBo user, PageQuery pageQuery) { + return R.ok(userService.selectAllocatedList(user, pageQuery)); } /** @@ -215,8 +215,8 @@ public class SysRoleController extends BaseController { */ @SaCheckPermission("system:role:list") @GetMapping("/authUser/unallocatedList") - public TableDataInfo unallocatedList(SysUserBo user, PageQuery pageQuery) { - return userService.selectUnallocatedList(user, pageQuery); + public R> unallocatedList(SysUserBo user, PageQuery pageQuery) { + return R.ok(userService.selectUnallocatedList(user, pageQuery)); } /** 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 466a4aec6..3f620caae 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 @@ -67,8 +67,8 @@ public class SysUserController extends BaseController { */ @SaCheckPermission("system:user:list") @GetMapping("/list") - public TableDataInfo list(SysUserBo user, PageQuery pageQuery) { - return userService.selectPageUserList(user, pageQuery); + public R> list(SysUserBo user, PageQuery pageQuery) { + return R.ok(userService.selectPageUserList(user, pageQuery)); } /** 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 aaf4fb56f..5accc8bc1 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 @@ -46,8 +46,8 @@ public class FlwDefinitionController extends BaseController { * @return 流程定义分页数据 */ @GetMapping("/list") - public TableDataInfo list(FlowDefinition flowDefinition, PageQuery pageQuery) { - return flwDefinitionService.queryList(flowDefinition, pageQuery); + public R> list(FlowDefinition flowDefinition, PageQuery pageQuery) { + return R.ok(flwDefinitionService.queryList(flowDefinition, pageQuery)); } /** @@ -58,8 +58,8 @@ public class FlwDefinitionController extends BaseController { * @return 未发布流程定义分页数据 */ @GetMapping("/unPublishList") - public TableDataInfo unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { - return flwDefinitionService.unPublishList(flowDefinition, pageQuery); + public R> unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) { + return R.ok(flwDefinitionService.unPublishList(flowDefinition, pageQuery)); } /** 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 66137eb7c..9e21134be 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 @@ -47,8 +47,8 @@ public class FlwInstanceController extends BaseController { * @return 正在运行的流程实例分页数据 */ @GetMapping("/pageByRunning") - public TableDataInfo selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { - return flwInstanceService.selectRunningInstanceList(flowInstanceBo, pageQuery); + public R> selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return R.ok(flwInstanceService.selectRunningInstanceList(flowInstanceBo, pageQuery)); } /** @@ -59,8 +59,8 @@ public class FlwInstanceController extends BaseController { * @return 已结束的流程实例分页数据 */ @GetMapping("/pageByFinish") - public TableDataInfo selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { - return flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery); + public R> selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return R.ok(flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery)); } /** @@ -145,8 +145,8 @@ public class FlwInstanceController extends BaseController { * @return 当前用户发起的流程实例分页数据 */ @GetMapping("/pageByCurrent") - public TableDataInfo selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { - return flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery); + public R> selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) { + return R.ok(flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery)); } /** 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 3f8aad044..51ea28f77 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 @@ -46,8 +46,8 @@ public class FlwSpelController extends BaseController { */ @SaCheckPermission("workflow:spel:list") @GetMapping("/list") - public TableDataInfo list(FlowSpelBo bo, PageQuery pageQuery) { - return flwSpelService.queryPageList(bo, pageQuery); + public R> list(FlowSpelBo bo, PageQuery pageQuery) { + return R.ok(flwSpelService.queryPageList(bo, pageQuery)); } /** 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 f9f3a182c..ff1e4427a 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 @@ -72,8 +72,8 @@ public class FlwTaskController extends BaseController { * @return 待办任务分页数据 */ @GetMapping("/pageByTaskWait") - public TableDataInfo pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.pageByTaskWait(flowTaskBo, pageQuery); + public R> pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return R.ok(flwTaskService.pageByTaskWait(flowTaskBo, pageQuery)); } /** @@ -84,8 +84,8 @@ public class FlwTaskController extends BaseController { * @return 已办任务分页数据 */ @GetMapping("/pageByTaskFinish") - public TableDataInfo pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.pageByTaskFinish(flowTaskBo, pageQuery); + public R> pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return R.ok(flwTaskService.pageByTaskFinish(flowTaskBo, pageQuery)); } /** @@ -97,8 +97,8 @@ public class FlwTaskController extends BaseController { * @return 待办任务分页数据 */ @GetMapping("/pageByAllTaskWait") - public TableDataInfo pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.pageByAllTaskWait(flowTaskBo, pageQuery); + public R> pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return R.ok(flwTaskService.pageByAllTaskWait(flowTaskBo, pageQuery)); } /** @@ -109,8 +109,8 @@ public class FlwTaskController extends BaseController { * @return 已办任务分页数据 */ @GetMapping("/pageByAllTaskFinish") - public TableDataInfo pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.pageByAllTaskFinish(flowTaskBo, pageQuery); + public R> pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return R.ok(flwTaskService.pageByAllTaskFinish(flowTaskBo, pageQuery)); } /** @@ -121,8 +121,8 @@ public class FlwTaskController extends BaseController { * @return 抄送任务分页数据 */ @GetMapping("/pageByTaskCopy") - public TableDataInfo pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { - return flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery); + public R> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) { + return R.ok(flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery)); } /** 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 10e6c21c6..5da3f4b80 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 @@ -48,8 +48,8 @@ public class TestLeaveController extends BaseController { */ @SaCheckPermission("workflow:leave:list") @GetMapping("/list") - public TableDataInfo list(TestLeaveBo bo, PageQuery pageQuery) { - return testLeaveService.queryPageList(bo, pageQuery); + public R> list(TestLeaveBo bo, PageQuery pageQuery) { + return R.ok(testLeaveService.queryPageList(bo, pageQuery)); } /**