Browse Source

fix:项目详情页对权限进行控制,区域类型的项目适配新的区域通配符

xuexiaobo 6 years ago
parent
commit
7bde09e105

+ 3 - 1
site/src/main/java/com/mooctest/crowd/site/mediator/impl/WebMediatorImpl.java

@@ -432,7 +432,9 @@ public class WebMediatorImpl implements ViewMediator {
             } //下面两种情况为非定向未被接收
             else if (project.getProjectDistributionTypeId()==1){
                 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);
                 }
             } else if (project.getProjectDistributionTypeId() == 2){