Merge remote-tracking branch 'origin/dev_project_branch' into dev_project_branch

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java

@@ -118,6 +118,7 @@ public class GovProjectServiceImpl implements GovProjectService {
 		AllProjectResultDTO resultDTO = new AllProjectResultDTO();
 		String agencyId = govOrgService.getAgencyIdByUserId(tokenDto.getUserId());
 		int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+
 		if (StringUtils.isEmpty(agencyId)) {
 			throw new RenException(String.format("获取工作人员组织信息失败,staffId->%s", tokenDto.getUserId()));
 		}
@@ -141,27 +142,31 @@ public class GovProjectServiceImpl implements GovProjectService {
 				project.setCurrentDisposeDept(departmentList);
 
 			});
+			int pageSize =  pageIndex + formDTO.getPageSize();
+			if (pageSize > projectList.size()) {
+				pageSize = projectList.size();
+			}
 			//排序(创建:create 更新:update 部门:department 耗时:date 次数:count)
 			switch (formDTO.getSortType()) {
 				case "create":
 					projectList = projectList.stream().sorted(Comparator.comparing(ProjectInfoDTO::getProjectTime).reversed())
-							.collect(Collectors.toList()).subList(pageIndex, pageIndex + formDTO.getPageSize());
+							.collect(Collectors.toList()).subList(pageIndex, pageSize);
 					break;
 				case "update":
 					projectList = projectList.stream().sorted(Comparator.comparing(ProjectInfoDTO::getUpdateTime).reversed())
-							.collect(Collectors.toList()).subList(pageIndex, pageIndex + formDTO.getPageSize());
+							.collect(Collectors.toList()).subList(pageIndex, pageSize);
 					break;
 				case "department":
 					projectList = projectList.stream().sorted(Comparator.comparing(ProjectInfoDTO::getDepartmentCount).reversed())
-							.collect(Collectors.toList()).subList(pageIndex, pageIndex + formDTO.getPageSize());
+							.collect(Collectors.toList()).subList(pageIndex, pageSize);
 					break;
 				case "date":
 					projectList = projectList.stream().sorted(Comparator.comparing(ProjectInfoDTO::getTimeSpent).reversed())
-							.collect(Collectors.toList()).subList(pageIndex, pageIndex + formDTO.getPageSize());
+							.collect(Collectors.toList()).subList(pageIndex, pageSize);
 					break;
 				case "count":
 					projectList = projectList.stream().sorted(Comparator.comparing(ProjectInfoDTO::getProcessCount).reversed())
-							.collect(Collectors.toList()).subList(pageIndex, pageIndex + formDTO.getPageSize());
+							.collect(Collectors.toList()).subList(pageIndex, pageSize);
 					break;
 				default:
 					break;