|
@@ -432,7 +432,9 @@ public class WebMediatorImpl implements ViewMediator {
|
|
|
} //下面两种情况为非定向未被接收
|
|
} //下面两种情况为非定向未被接收
|
|
|
else if (project.getProjectDistributionTypeId()==1){
|
|
else if (project.getProjectDistributionTypeId()==1){
|
|
|
if (project.getStatus()==CrowdTestProjectStatus.HAS_RELEASED
|
|
if (project.getStatus()==CrowdTestProjectStatus.HAS_RELEASED
|
|
|
- && user.getRegionalManager().getRegionalList().stream().anyMatch(regional -> regional.getCity().equals(project.getDistributionCity()))){
|
|
|
|
|
|
|
+ && user.getRegionalManager().getRegionalList()
|
|
|
|
|
+ .stream().anyMatch(regional -> (regional.getProvince().equals("*")||regional.getProvince().equals(project.getDistributionProvince()))
|
|
|
|
|
+ && (regional.getCity().equals("*")||regional.getCity().equals(project.getDistributionCity())))){
|
|
|
operationControl.setReceive(true);
|
|
operationControl.setReceive(true);
|
|
|
}
|
|
}
|
|
|
} else if (project.getProjectDistributionTypeId() == 2){
|
|
} else if (project.getProjectDistributionTypeId() == 2){
|