diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java index 8d4fe09..d912846 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java @@ -57,25 +57,13 @@ public class AutoMatchFacade { List list = usersService.queryUsers(usersQuery); List data = new ArrayList<>(); if (CollectionUtils.isNotEmpty(list)) { - data.add(list.get(0).getOrgId()); - /* //用户角色 - if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType())) { - List list2 = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId())); - if(CollectionUtils.isNotEmpty(list2)){ - for(Organization organization:list2){ - data.add(organization.getId()); - } - } - }else if(UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())){ - List list2 = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId())); - if(CollectionUtils.isNotEmpty(list2)){ - for(Organization organization:list2){ - data.add(organization.getId()); - } - } + + /**/ //用户角色 + if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType())||UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())) { + data.add(list.get(0).getOrgId()); } else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(list.get(0).getType())) { return null; - }*/ + } return data; } return null;