diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java index 97ea866c..bf27d801 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/controller/admin/RescueInfoSystem.java @@ -322,10 +322,14 @@ public class RescueInfoSystem extends BaseController { @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) { Page page = new Page<>(pageNo, pageSize); IPage rescueInfos = rescueInfoService.getRescueInfoByDriver(rescueInfo, page); - TableDataInfo dataTable = getDataTable(rescueInfos.getRecords()); List list = rescueInfoService.moneyManagement2(rescueInfos.getRecords(), rescueInfo.getRescueStart()); - dataTable.setRows(list); - return success(dataTable); + IPage result = new Page<>(pageNo, pageSize); + result.setRecords(list); + result.setTotal(rescueInfos.getTotal()); + result.setCurrent(rescueInfos.getCurrent()); + result.setPages(rescueInfos.getPages()); + result.setSize(rescueInfos.getSize()); + return success(result); } /**