From 1bde682d9149b5b55488cfaa277ec1deacab4bee Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 30 四月 2025 08:57:11 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/controller/TaskWrkController.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java index 3df677d..7a58fad 100644 --- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java +++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java @@ -87,9 +87,9 @@ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} List<TaskWrk> taskWrkList = taskWrkService.selectTaskWrkList(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd, curr, limit); - Page<TaskWrk> page1 = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList); - page1.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd)); - return R.ok(page1); + Page<TaskWrk> page = new Page<TaskWrk>(curr, limit).setRecords(taskWrkList); + page.setTotal(taskWrkService.selectTaskWrkListTotal(wrkNo,taskNo,status,modiTimeStart,modiTimeEnd)); + return R.ok(page); // return R.ok(taskWrkService.selectPage(new Page<>(curr, limit), wrapper)); } catch (Exception e) { -- Gitblit v1.9.1