|
|
@@ -171,9 +171,9 @@ public class WebMediatorImpl implements ViewMediator {
|
|
|
//广场的
|
|
|
acceptableProject.addAll(projectDao.findAllByStatusLessThanAndProjectDistributionTypeId(CrowdTestProjectStatus.HAS_RECEIVED, 2L));
|
|
|
//区域的
|
|
|
- for (RegionalManagerToRegional regional : user.getRegionalManager().getRegionalList()) {
|
|
|
- acceptableProject.addAll(projectDao.findByStatusLessThanAndProjectDistributionTypeIdAndDistributionCity(CrowdTestProjectStatus.HAS_RECEIVED, 1L, regional.getCity()));
|
|
|
- }
|
|
|
+ acceptableProject.addAll(projectDao.findByStatusLessThanAndProjectDistributionTypeId(CrowdTestProjectStatus.HAS_RECEIVED, 1L)
|
|
|
+ .stream().filter(crowdTestProjectPO -> user.getRegionalManager().getRegionalList().stream()
|
|
|
+ .anyMatch(reg -> (reg.getProvince().equals("*") || reg.getProvince().equals(crowdTestProjectPO.getDistributionProvince())) && (reg.getCity().equals("*")||reg.getCity().equals(crowdTestProjectPO.getDistributionCity())))).collect(Collectors.toList()));
|
|
|
myCrowdDTO.setAcceptableProjects(acceptableProject.stream().map(crowdTestProjectPO -> {
|
|
|
CrowdTestProject project = new CrowdTestProject();
|
|
|
BeanUtils.copyProperties(crowdTestProjectPO, project);
|