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 ab1036e..8d4fe09 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 @@ -58,7 +58,7 @@ public class AutoMatchFacade { 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)){ @@ -66,27 +66,19 @@ public class AutoMatchFacade { data.add(organization.getId()); } } - } else if(UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())){ + }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()); } } - /*UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); - userOrganizationMapsQuery.setUserId(list.get(0).getId()); - userOrganizationMapsQuery.setYn(YnEnums.YES.getId()); - List list1 = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery); - if(CollectionUtils.isNotEmpty(list1)){ - for(UserOrganizationMaps userOrganizationMaps:list1){ - data.add(userOrganizationMaps.getOrgId()); - } - }*/ } else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(list.get(0).getType())) { return null; - } + }*/ + return data; } - return data; + return null; } public String getHospitalId(Integer userId){ List list = matchOrgId(userId);