test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-11-29 18:58:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[Fix-16680][ApiServer] Query project list paging error (#16681)

Browse Source
This commit is contained in:
veli.yang 2024-10-12 08:54:03 +08:00 committed by GitHub
parent 9a58ecae99
commit ea268d6031
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
View File

@ -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) {