(dolphinscheduler) branch dev updated: [Fix-16680][ApiServer] Query project list paging error (#16681)

[zihaoxiang]

This is an automated email from the ASF dual-hosted git repository.

zihaoxiang pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new ea268d6031 [Fix-16680][ApiServer] Query project list paging error 
(#16681)
ea268d6031 is described below

commit ea268d60317c8dffb9f19c32452b841db5df24b5
Author: veli.yang <897900...@qq.com>
AuthorDate: Sat Oct 12 08:54:03 2024 +0800

    [Fix-16680][ApiServer] Query project list paging error (#16681)
---
 .../api/service/impl/ProjectServiceImpl.java                | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
index 3cab05aa77..ef36d95145 100644
--- 
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
+++ 
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
@@ -391,13 +391,18 @@ public class ProjectServiceImpl extends BaseServiceImpl 
implements ProjectServic
                 project.setPerm(Constants.DEFAULT_ADMIN_PERMISSION);
             }
         }
+        if (CollectionUtils.isEmpty(projectList)) {
+            result.setData(pageInfo);
+            putMsg(result, Status.SUCCESS);
+            return result;
+        }
         List<User> userList = userMapper.selectByIds(projectList.stream()
                 
.map(Project::getUserId).distinct().collect(Collectors.toList()));
         Map<Integer, String> userMap = 
userList.stream().collect(Collectors.toMap(User::getId, User::getUserName));
-        List<ProjectWorkflowDefinitionCount> 
projectWorkflowDefinitionCountList =
-                
workflowDefinitionMapper.queryProjectWorkflowDefinitionCountByProjectCodes(
-                        
projectList.stream().map(Project::getCode).distinct().collect(Collectors.toList()));
-        Map<Long, Integer> projectWorkflowDefinitionCountMap = 
projectWorkflowDefinitionCountList.stream()
+        List<Long> projectCodes = 
projectList.stream().map(Project::getCode).distinct().collect(Collectors.toList());
+        Map<Long, Integer> projectWorkflowDefinitionCountMap = 
workflowDefinitionMapper
+                
.queryProjectWorkflowDefinitionCountByProjectCodes(projectCodes)
+                .stream()
                 
.collect(Collectors.toMap(ProjectWorkflowDefinitionCount::getProjectCode,
                         ProjectWorkflowDefinitionCount::getCount));
         for (Project project : projectList) {