21

src/main/java/com/fdkankan/site/service/impl/ProjectServiceImpl.java

@@ -66,17 +66,24 @@ public class ProjectServiceImpl extends ServiceImpl<IProjectMapper, Project> imp
         List<ProjectTeam> teamList = projectTeamService.getListByUserName(userName);
         Set<Integer> projectIds = teamList.parallelStream().map(ProjectTeam::getProjectId).collect(Collectors.toSet());
         List<ProjectNum> numList = projectNumService.getListByProjectIds(projectIds);
-        long count = 0L;
+        Integer projectCount = 0;
+        Long overCount = 0L;
         if(projectIds.size() >0){
             LambdaQueryWrapper<Project> wrapper = new LambdaQueryWrapper<>();
             wrapper.in(Project::getProjectId,projectIds);
-            wrapper.eq(Project::getProjectStatus,1);
-            count = this.count(wrapper);
+            List<Project> list = this.list(wrapper);
+            projectCount = list.size();
+            for (Project project : list) {
+                if(project.getProjectStatus() == 1){
+                    overCount ++;
+                }
+            }
+
         }
 
-        userData.setProjectCount((long) projectIds.size());
+        userData.setProjectCount(Long.valueOf(projectCount));
         userData.setProjectSceneCount((long) numList.size());
-        userData.setProjectOverCount(count);
+        userData.setProjectOverCount(overCount);
         return userData;
     }