Commit b9b7b8aaad3b152032439f24c79b6fe2a5b0ed40
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
View file @
b9b7b8a
| ... | ... | @@ -60,15 +60,15 @@ |
| 60 | 60 | |
| 61 | 61 | /**/ //用户角色 |
| 62 | 62 | if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType())||UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())) { |
| 63 | - List<Organization> list2 = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId())); | |
| 63 | + /* List<Organization> list2 = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId())); | |
| 64 | 64 | if(CollectionUtils.isNotEmpty(list2)){ |
| 65 | 65 | for(Organization organization:list2){ |
| 66 | 66 | data.add(organization.getId()); |
| 67 | 67 | } |
| 68 | - } | |
| 69 | - if (!data.contains(list.get(0).getOrgId())) { | |
| 68 | + }*/ | |
| 69 | +// if (!data.contains(list.get(0).getOrgId())) { | |
| 70 | 70 | data.add(list.get(0).getOrgId()); |
| 71 | - } | |
| 71 | +// } | |
| 72 | 72 | } else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(list.get(0).getType())) { |
| 73 | 73 | return null; |
| 74 | 74 | } |