From fbfc2ba9276e79950a0949324bc8ba976cdca99b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 08 五月 2024 17:29:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
index abc41bd..d50ec03 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/WorkOrderServiceImpl.java
@@ -220,8 +220,9 @@
@Override
public Result distributePage(DistributeWorkOrderQuery query) {
- List<WorkOrderVO> page = baseMapper.distributePage(query);
- return Result.ok().data(page).total(page.size());
+ IPage<WorkOrderVO> page = PageUtil.getPage(query, WorkOrderVO.class);
+ baseMapper.distributePage(page, query);
+ return Result.ok().data(page).total(page.getTotal());
}
@Override
--
Gitblit v1.8.0