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 f4f34e2..961b1a4 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 @@ -4,10 +4,9 @@ import com.lyms.platform.biz.param.CommunityQuery; import com.lyms.platform.biz.service.CommunityConfigService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.enums.YnEnums; -import com.lyms.platform.permission.model.Organization; -import com.lyms.platform.permission.model.Users; -import com.lyms.platform.permission.model.UsersQuery; +import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UserOrganizationMapsService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.CommunityConfig; import com.lyms.platform.pojo.Patients; @@ -32,6 +31,8 @@ public class AutoMatchFacade { private CommunityConfigService communityConfigService; @Autowired private PatientsService patientsService; + @Autowired + private UserOrganizationMapsService userOrganizationMapsService; public String match(int userId) { UsersQuery usersQuery = new UsersQuery(); @@ -44,6 +45,8 @@ public class AutoMatchFacade { if (list.get(0).getType() == 1) { Organization organization = organizationService.getOrganization(list.get(0).getOrgId()); return organization.getAreaId(); + }else { + } } return null; @@ -64,10 +67,19 @@ public class AutoMatchFacade { data.add(users.getOrgId()); } } - return data; + } else{ + 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()); + } + } } } - return null; + return data; }