代码提交

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -413,6 +413,8 @@ public class ProjectController {
 						createUserIds.forEach(e->{
 							LambdaQueryWrapper<ServiceProject> countCops=new LambdaQueryWrapper<>();
 							countCops
+							    .apply(" year(create_time) = '"+finalYear+"'")
+								.eq(ServiceProject::getIsDeleted,0)
 								.eq(ServiceProject::getCreateUser,e)
 								.eq(ServiceProject::getTenantId,AuthUtil.getTenantId());
 							int copsSize = serviceProjectService.list(countCops).stream().map(ServiceProject::getCorpId).distinct().collect(Collectors.toList()).size();
@@ -427,6 +429,8 @@ public class ProjectController {
 						corpsIds.forEach(e->{
 							LambdaQueryWrapper<ServiceProject> countCreateUser=new LambdaQueryWrapper<>();
 							countCreateUser
+								.apply(" year(create_time) = '"+finalYear+"'")
+								.eq(ServiceProject::getIsDeleted,0)
 								.eq(ServiceProject::getCorpId,e)
 								.eq(ServiceProject::getTenantId,AuthUtil.getTenantId());
 							int createUserSize = serviceProjectService.list(countCreateUser).stream().map(ServiceProject::getCreateUser).distinct().collect(Collectors.toList()).size();