From 275443ff38a508a8594d40e0fdb321862aaeabd5 Mon Sep 17 00:00:00 2001 From: ReonYu Date: Fri, 5 Nov 2021 20:23:20 +0800 Subject: [PATCH] [FIX 6701] [API] Fix paging error when worker group number more than 10 (#6704) --- .../api/service/impl/WorkerGroupServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java index 8124ed9656..379af645df 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java @@ -185,6 +185,7 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro List workerGroups = getWorkerGroups(true); List resultDataList = new ArrayList<>(); + int total = 0; if (CollectionUtils.isNotEmpty(workerGroups)) { List searchValDataList = new ArrayList<>(); @@ -198,7 +199,7 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro } else { searchValDataList = workerGroups; } - + total = searchValDataList.size(); if (fromIndex < searchValDataList.size()) { if (toIndex > searchValDataList.size()) { toIndex = searchValDataList.size(); @@ -208,7 +209,7 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro } PageInfo pageInfo = new PageInfo<>(pageNo, pageSize); - pageInfo.setTotal(resultDataList.size()); + pageInfo.setTotal(total); pageInfo.setTotalList(resultDataList); result.setData(pageInfo);