opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 01:25:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[mod]分页查询接口使用R类型返回：数据放入data中

Browse Source
This commit is contained in:
Carrierli 2026-03-17 16:36:34 +08:00
parent c0f1614bc4
commit bba6e25539
24 changed files with 72 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/TableDataInfo.java
View File

@ -32,16 +32,6 @@ public class TableDataInfo<T> implements Serializable {
*/
private List<T> rows;
/**
* 消息状态码
*/
private int code;
/**
* 消息内容
*/
private String msg;
/**
* 分页
*
@ -51,8 +41,6 @@ public class TableDataInfo<T> implements Serializable {
public TableDataInfo(List<T> list, long total) {
this.rows = list;
this.total = total;
this.code = HttpStatus.HTTP_OK;
this.msg = "查询成功";
}
/**
@ -60,8 +48,6 @@ public class TableDataInfo<T> implements Serializable {
*/
public static <T> TableDataInfo<T> build(IPage<T> page) {
TableDataInfo<T> 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<T> implements Serializable {
*/
public static <T> TableDataInfo<T> build(List<T> list) {
TableDataInfo<T> 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<T> implements Serializable {
*/
public static <T> TableDataInfo<T> build() {
TableDataInfo<T> rspData = new TableDataInfo<>();
rspData.setCode(HttpStatus.HTTP_OK);
rspData.setMsg("查询成功");
return rspData;
}

8
ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java
View File

@ -52,8 +52,8 @@ public class TestDemoController extends BaseController {
*/
@SaCheckPermission("demo:demo:list")
@GetMapping("/list")
public TableDataInfo<TestDemoVo> list(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
return testDemoService.queryPageList(bo, pageQuery);
public R<TableDataInfo<TestDemoVo>> 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<TestDemoVo> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
return testDemoService.customPageList(bo, pageQuery);
public R<TableDataInfo<TestDemoVo>> page(@Validated(QueryGroup.class) TestDemoBo bo, PageQuery pageQuery) {
return R.ok(testDemoService.customPageList(bo, pageQuery));
}
/**

12
ruoyi-modules/ruoyi-generator/src/main/java/org/dromara/generator/controller/GenController.java
View File

@ -47,8 +47,8 @@ public class GenController extends BaseController {
*/
@SaCheckPermission("tool:gen:list")
@GetMapping("/list")
public TableDataInfo<GenTable> genList(GenTable genTable, PageQuery pageQuery) {
return genTableService.selectPageGenTableList(genTable, pageQuery);
public R<TableDataInfo<GenTable>> 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<GenTable> dataList(GenTable genTable, PageQuery pageQuery) {
return genTableService.selectPageDbTableList(genTable, pageQuery);
public R<TableDataInfo<GenTable>> 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<GenTableColumn> columnList(@PathVariable("tableId") Long tableId) {
public R<TableDataInfo<GenTableColumn>> columnList(@PathVariable("tableId") Long tableId) {
List<GenTableColumn> list = genTableService.selectGenTableColumnListByTableId(tableId);
return TableDataInfo.build(list);
return R.ok(TableDataInfo.build(list));
}
/**

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/java/controller.java.vm
View File

@ -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<TableDataInfo<${ClassName}Vo>> list(${ClassName}Bo bo, PageQuery pageQuery) {
return R.ok(${className}Service.queryPageList(bo, pageQuery));
}
#elseif($table.tree)
public R<List<${ClassName}Vo>> list(${ClassName}Bo bo) {

3
ruoyi-modules/ruoyi-generator/src/main/resources/vm/ts/api.ts.vm
View File

@ -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<PageResult<${BusinessName}VO>> => {
return request({
url: '/${moduleName}/${businessName}/list',
method: 'get',

4
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

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

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLoginInfoController.java
View File

@ -44,8 +44,8 @@ public class SysLoginInfoController extends BaseController {
*/
@SaCheckPermission("monitor:logininfo:list")
@GetMapping("/list")
public TableDataInfo<SysLoginInfoVo> list(SysLoginInfoBo loginInfo, PageQuery pageQuery) {
return loginInfoService.selectPageLoginInfoList(loginInfo, pageQuery);
public R<TableDataInfo<SysLoginInfoVo>> list(SysLoginInfoBo loginInfo, PageQuery pageQuery) {
return R.ok(loginInfoService.selectPageLoginInfoList(loginInfo, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysOperlogController.java
View File

@ -41,8 +41,8 @@ public class SysOperlogController extends BaseController {
*/
@SaCheckPermission("monitor:operlog:list")
@GetMapping("/list")
public TableDataInfo<SysOperLogVo> list(SysOperLogBo operLog, PageQuery pageQuery) {
return operLogService.selectPageOperLogList(operLog, pageQuery);
public R<TableDataInfo<SysOperLogVo>> list(SysOperLogBo operLog, PageQuery pageQuery) {
return R.ok(operLogService.selectPageOperLogList(operLog, pageQuery));
}
/**

8
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java
View File

@ -44,7 +44,7 @@ public class SysUserOnlineController extends BaseController {
*/
@SaCheckPermission("monitor:online:list")
@GetMapping("/list")
public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
public R<TableDataInfo<SysUserOnline>> list(String ipaddr, String userName) {
// 获取所有未过期的 token
Collection<String> keys = RedisUtils.keys(CacheConstants.ONLINE_TOKEN_KEY + "*");
List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
@ -73,7 +73,7 @@ public class SysUserOnlineController extends BaseController {
Collections.reverse(userOnlineDTOList);
userOnlineDTOList.removeAll(Collections.singleton(null));
List<SysUserOnline> 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<SysUserOnline> getInfo() {
public R<TableDataInfo<SysUserOnline>> getInfo() {
// 获取指定账号 id 的 token 集合
List<String> tokenIds = StpUtil.getTokenValueListByLoginId(StpUtil.getLoginIdAsString());
List<UserOnlineDTO> userOnlineDTOList = tokenIds.stream()
@ -111,7 +111,7 @@ public class SysUserOnlineController extends BaseController {
Collections.reverse(userOnlineDTOList);
userOnlineDTOList.removeAll(Collections.singleton(null));
List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
return TableDataInfo.build(userOnlineList);
return R.ok(TableDataInfo.build(userOnlineList));
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java
View File

@ -46,8 +46,8 @@ public class SysClientController extends BaseController {
*/
@SaCheckPermission("system:client:list")
@GetMapping("/list")
public TableDataInfo<SysClientVo> list(SysClientBo bo, PageQuery pageQuery) {
return sysClientService.queryPageList(bo, pageQuery);
public R<TableDataInfo<SysClientVo>> list(SysClientBo bo, PageQuery pageQuery) {
return R.ok(sysClientService.queryPageList(bo, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java
View File

@ -42,8 +42,8 @@ public class SysConfigController extends BaseController {
*/
@SaCheckPermission("system:config:list")
@GetMapping("/list")
public TableDataInfo<SysConfigVo> list(SysConfigBo config, PageQuery pageQuery) {
return configService.selectPageConfigList(config, pageQuery);
public R<TableDataInfo<SysConfigVo>> list(SysConfigBo config, PageQuery pageQuery) {
return R.ok(configService.selectPageConfigList(config, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java
View File

@ -46,8 +46,8 @@ public class SysDictDataController extends BaseController {
*/
@SaCheckPermission("system:dict:list")
@GetMapping("/list")
public TableDataInfo<SysDictDataVo> list(SysDictDataBo dictData, PageQuery pageQuery) {
return dictDataService.selectPageDictDataList(dictData, pageQuery);
public R<TableDataInfo<SysDictDataVo>> list(SysDictDataBo dictData, PageQuery pageQuery) {
return R.ok(dictDataService.selectPageDictDataList(dictData, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java
View File

@ -43,8 +43,8 @@ public class SysDictTypeController extends BaseController {
*/
@SaCheckPermission("system:dict:list")
@GetMapping("/list")
public TableDataInfo<SysDictTypeVo> list(SysDictTypeBo dictType, PageQuery pageQuery) {
return dictTypeService.selectPageDictTypeList(dictType, pageQuery);
public R<TableDataInfo<SysDictTypeVo>> list(SysDictTypeBo dictType, PageQuery pageQuery) {
return R.ok(dictTypeService.selectPageDictTypeList(dictType, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java
View File

@ -40,8 +40,8 @@ public class SysNoticeController extends BaseController {
*/
@SaCheckPermission("system:notice:list")
@GetMapping("/list")
public TableDataInfo<SysNoticeVo> list(SysNoticeBo notice, PageQuery pageQuery) {
return noticeService.selectPageNoticeList(notice, pageQuery);
public R<TableDataInfo<SysNoticeVo>> list(SysNoticeBo notice, PageQuery pageQuery) {
return R.ok(noticeService.selectPageNoticeList(notice, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssConfigController.java
View File

@ -46,8 +46,8 @@ public class SysOssConfigController extends BaseController {
*/
@SaCheckPermission("system:ossConfig:list")
@GetMapping("/list")
public TableDataInfo<SysOssConfigVo> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
return ossConfigService.queryPageList(bo, pageQuery);
public R<TableDataInfo<SysOssConfigVo>> list(@Validated(QueryGroup.class) SysOssConfigBo bo, PageQuery pageQuery) {
return R.ok(ossConfigService.queryPageList(bo, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
View File

@ -47,8 +47,8 @@ public class SysOssController extends BaseController {
*/
@SaCheckPermission("system:oss:list")
@GetMapping("/list")
public TableDataInfo<SysOssVo> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
return ossService.queryPageList(bo, pageQuery);
public R<TableDataInfo<SysOssVo>> list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) {
return R.ok(ossService.queryPageList(bo, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java
View File

@ -49,8 +49,8 @@ public class SysPostController extends BaseController {
*/
@SaCheckPermission("system:post:list")
@GetMapping("/list")
public TableDataInfo<SysPostVo> list(SysPostBo post, PageQuery pageQuery) {
return postService.selectPagePostList(post, pageQuery);
public R<TableDataInfo<SysPostVo>> list(SysPostBo post, PageQuery pageQuery) {
return R.ok(postService.selectPagePostList(post, pageQuery));
}
/**

12
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java
View File

@ -50,8 +50,8 @@ public class SysRoleController extends BaseController {
*/
@SaCheckPermission("system:role:list")
@GetMapping("/list")
public TableDataInfo<SysRoleVo> list(SysRoleBo role, PageQuery pageQuery) {
return roleService.selectPageRoleList(role, pageQuery);
public R<TableDataInfo<SysRoleVo>> 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<SysUserVo> allocatedList(SysUserBo user, PageQuery pageQuery) {
return userService.selectAllocatedList(user, pageQuery);
public R<TableDataInfo<SysUserVo>> 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<SysUserVo> unallocatedList(SysUserBo user, PageQuery pageQuery) {
return userService.selectUnallocatedList(user, pageQuery);
public R<TableDataInfo<SysUserVo>> unallocatedList(SysUserBo user, PageQuery pageQuery) {
return R.ok(userService.selectUnallocatedList(user, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java
View File

@ -67,8 +67,8 @@ public class SysUserController extends BaseController {
*/
@SaCheckPermission("system:user:list")
@GetMapping("/list")
public TableDataInfo<SysUserVo> list(SysUserBo user, PageQuery pageQuery) {
return userService.selectPageUserList(user, pageQuery);
public R<TableDataInfo<SysUserVo>> list(SysUserBo user, PageQuery pageQuery) {
return R.ok(userService.selectPageUserList(user, pageQuery));
}
/**

8
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java
View File

@ -46,8 +46,8 @@ public class FlwDefinitionController extends BaseController {
* @return 流程定义分页数据
*/
@GetMapping("/list")
public TableDataInfo<FlowDefinitionVo> list(FlowDefinition flowDefinition, PageQuery pageQuery) {
return flwDefinitionService.queryList(flowDefinition, pageQuery);
public R<TableDataInfo<FlowDefinitionVo>> 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<FlowDefinitionVo> unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) {
return flwDefinitionService.unPublishList(flowDefinition, pageQuery);
public R<TableDataInfo<FlowDefinitionVo>> unPublishList(FlowDefinition flowDefinition, PageQuery pageQuery) {
return R.ok(flwDefinitionService.unPublishList(flowDefinition, pageQuery));
}
/**

12
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java
View File

@ -47,8 +47,8 @@ public class FlwInstanceController extends BaseController {
* @return 正在运行的流程实例分页数据
*/
@GetMapping("/pageByRunning")
public TableDataInfo<FlowInstanceVo> selectRunningInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
return flwInstanceService.selectRunningInstanceList(flowInstanceBo, pageQuery);
public R<TableDataInfo<FlowInstanceVo>> 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<FlowInstanceVo> selectFinishInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
return flwInstanceService.selectFinishInstanceList(flowInstanceBo, pageQuery);
public R<TableDataInfo<FlowInstanceVo>> 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<FlowInstanceVo> selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
return flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery);
public R<TableDataInfo<FlowInstanceVo>> selectCurrentInstanceList(FlowInstanceBo flowInstanceBo, PageQuery pageQuery) {
return R.ok(flwInstanceService.selectCurrentInstanceList(flowInstanceBo, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java
View File

@ -46,8 +46,8 @@ public class FlwSpelController extends BaseController {
*/
@SaCheckPermission("workflow:spel:list")
@GetMapping("/list")
public TableDataInfo<FlowSpelVo> list(FlowSpelBo bo, PageQuery pageQuery) {
return flwSpelService.queryPageList(bo, pageQuery);
public R<TableDataInfo<FlowSpelVo>> list(FlowSpelBo bo, PageQuery pageQuery) {
return R.ok(flwSpelService.queryPageList(bo, pageQuery));
}
/**

20
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java
View File

@ -72,8 +72,8 @@ public class FlwTaskController extends BaseController {
* @return 待办任务分页数据
*/
@GetMapping("/pageByTaskWait")
public TableDataInfo<FlowTaskVo> pageByTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return flwTaskService.pageByTaskWait(flowTaskBo, pageQuery);
public R<TableDataInfo<FlowTaskVo>> 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<FlowHisTaskVo> pageByTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return flwTaskService.pageByTaskFinish(flowTaskBo, pageQuery);
public R<TableDataInfo<FlowHisTaskVo>> 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<FlowTaskVo> pageByAllTaskWait(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return flwTaskService.pageByAllTaskWait(flowTaskBo, pageQuery);
public R<TableDataInfo<FlowTaskVo>> 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<FlowHisTaskVo> pageByAllTaskFinish(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return flwTaskService.pageByAllTaskFinish(flowTaskBo, pageQuery);
public R<TableDataInfo<FlowHisTaskVo>> 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<FlowTaskVo> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery);
public R<TableDataInfo<FlowTaskVo>> pageByTaskCopy(FlowTaskBo flowTaskBo, PageQuery pageQuery) {
return R.ok(flwTaskService.pageByTaskCopy(flowTaskBo, pageQuery));
}
/**

4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
View File

@ -48,8 +48,8 @@ public class TestLeaveController extends BaseController {
*/
@SaCheckPermission("workflow:leave:list")
@GetMapping("/list")
public TableDataInfo<TestLeaveVo> list(TestLeaveBo bo, PageQuery pageQuery) {
return testLeaveService.queryPageList(bo, pageQuery);
public R<TableDataInfo<TestLeaveVo>> list(TestLeaveBo bo, PageQuery pageQuery) {
return R.ok(testLeaveService.queryPageList(bo, pageQuery));
}
/**