diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java index a80d94b..1f819d5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java @@ -11,6 +11,7 @@ import com.lyms.platform.common.enums.OrganizationTypeEnum; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.ResultUtils; import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.operate.web.facade.AccessPermissionFacade; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.result.FrontEndResult; import com.lyms.platform.operate.web.utils.CommonsHelper; @@ -46,6 +47,8 @@ public class OrganizationController extends BaseController { private AutoMatchFacade autoMatchFacade; @Autowired private UserOrganizationMapsService userOrganizationMapsService; + @Autowired + private AccessPermissionFacade accessPermissionFacade; /** @@ -211,6 +214,7 @@ public class OrganizationController extends BaseController { String areaId = autoMatchFacade.match(loginState.getId()); List data = new ArrayList<>(); + List organizations; if (StringUtils.isNotEmpty(areaId)) { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setAreaId(areaId); @@ -219,30 +223,21 @@ public class OrganizationController extends BaseController { list.add(4); organizationQuery.setYn(YnEnums.YES.getId()); organizationQuery.setTypeList(list); - List organizations = organizationService.queryOrganization(organizationQuery); - if (CollectionUtils.isNotEmpty(organizations)) { - for (Organization organization : organizations) { - Map map = new HashMap<>(); - map.put("id", organization.getId()); - map.put("name", organization.getName()); - data.add(map); - } - } + organizations = organizationService.queryOrganization(organizationQuery); + } else { UserOrganizationMapsQuery userOrganizationMapsQuery = new UserOrganizationMapsQuery(); userOrganizationMapsQuery.setYn(YnEnums.YES.getId()); userOrganizationMapsQuery.setUserId(loginState.getId()); - List userOrganizationMapsList = userOrganizationMapsService.queryUserOrganizationMaps(userOrganizationMapsQuery); - if (CollectionUtils.isNotEmpty(userOrganizationMapsList)) { - for (UserOrganizationMaps userOrganizationMaps : userOrganizationMapsList) { - if (null != userOrganizationMaps.getOrgId()) { - Organization organization = organizationService.getOrganization(userOrganizationMaps.getOrgId()); - Map map = new HashMap<>(); - map.put("id", organization.getId()); - map.put("name", organization.getName()); - data.add(map); - } - } + organizations = accessPermissionFacade.findAccessPerminssionByUserId(loginState.getId()); + + } + if (CollectionUtils.isNotEmpty(organizations)) { + for (Organization organization : organizations) { + Map map = new HashMap<>(); + map.put("id", organization.getId()); + map.put("name", organization.getName()); + data.add(map); } } return new FrontEndResult().setData(data).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);