区域管理员可查看、接收的项目等fix

site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -129,15 +129,18 @@ public class WebMediatorImpl implements ViewMediator {
                             return new CrowdProjectVO(project);}).collect(Collectors.toList());
         //对于区域管理员
         if (user.getRegionalManager() != null){
+            List<CrowdTestProjectPO> crowdTestProjectPOList = projectDao.findByRegionalManagerIdAndIsDeleted(userId, DeletedStatus.isNotDeleted);
             //获取区域管理员正在处理中的项目列表
-            myCrowdDTO.setHandlingProjects(projectDao.findByRegionalManagerIdAndIsDeleted(userId, DeletedStatus.isNotDeleted)
-                    .stream().map(crowdTestProjectPO -> {
+            myCrowdDTO.setHandlingProjects(crowdTestProjectPOList.stream().filter(crowdTestProjectPO -> crowdTestProjectPO.getStatus()==2).map(crowdTestProjectPO -> {
                 CrowdTestProject project = new CrowdTestProject();
                 BeanUtils.copyProperties(crowdTestProjectPO, project);
                 return new CrowdProjectVO(project); }).collect(Collectors.toList()));
             //获取区域管理员可以接收领取的项目列表
-            List<CrowdTestProjectPO> acceptableProject = new ArrayList<>();
+            //定向
+            List<CrowdTestProjectPO> acceptableProject = crowdTestProjectPOList.stream().filter(crowdTestProjectPO -> crowdTestProjectPO.getStatus()<2).collect(Collectors.toList());
+            //广场的
             acceptableProject.addAll(projectDao.findAllByStatusLessThanAndProjectDistributionTypeId(CrowdTestProjectStatus.HAS_RECEIVED, 2L));
+            //区域的
             for (Regional regional : user.getRegionalManager().getRegionalList()) {
                 acceptableProject.addAll(projectDao.findByStatusLessThanAndProjectDistributionTypeIdAndDistributionCity(CrowdTestProjectStatus.HAS_RECEIVED, 1L, regional.getId()+""));
             }