From 3c81c99e7aab63c6b1afe39839ef778d594af4a8 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 21 一月 2025 15:21:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java index d7beadb..f00ba94 100644 --- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java +++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java @@ -305,6 +305,8 @@ if (Objects.nonNull(project)) { taskVO.setProjectId(project.getId()); taskVO.setProjectName(project.getProjectName()); + } else { + continue; } // 娴佺▼鍙戣捣浜轰俊鎭� @@ -364,6 +366,9 @@ taskVO.setHandlerUnitName(handlerUnitNames); vos.add(taskVO); } + if (vos.size() < pageSize) { + result.total(vos.size()); + } result.put("taskList", vos); } -- Gitblit v1.8.0