Commit 4710dea4e340f63e569c841d49fd8c6dd0ecf494
1 parent
aa1d01c302
Exists in
master
and in
8 other branches
add extends BaseModel
Showing 1 changed file with 9 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java
View file @
4710dea
| ... | ... | @@ -60,7 +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 | - data.add(list.get(0).getOrgId()); | |
| 63 | + List<Organization> list2 = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId())); | |
| 64 | + if(CollectionUtils.isNotEmpty(list2)){ | |
| 65 | + for(Organization organization:list2){ | |
| 66 | + data.add(organization.getId()); | |
| 67 | + } | |
| 68 | + } | |
| 69 | + if (!data.contains(list.get(0).getOrgId())) { | |
| 70 | + data.add(list.get(0).getOrgId()); | |
| 71 | + } | |
| 64 | 72 | } else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(list.get(0).getType())) { |
| 65 | 73 | return null; |
| 66 | 74 | } |