Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r9f35309859d8c6a6b34fc0505f6d47d8c882c848 -r68eab07e7b1947fed0f85b75d1856e7674ddebf7 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -r4b181ebda12a35a61d945b5bb2d286c124b76e62 -r68eab07e7b1947fed0f85b75d1856e7674ddebf7 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 4b181ebda12a35a61d945b5bb2d286c124b76e62) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 68eab07e7b1947fed0f85b75d1856e7674ddebf7) @@ -252,6 +252,16 @@ * @return a list of UserOrganisations */ public List getUserOrganisationsForUserByTypeAndStatus(String login, Integer typeId, Integer stateId); + + /** + * + * @param login + * @param typeId + * @param stateId + * @param parentOrgId + * @return a list of UserOrganisations + */ + public List getUserOrganisationsForUserByTypeAndStatusAndParent(String login, Integer typeId, Integer stateId, Integer parentOrgId); /** * @param login Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r4b181ebda12a35a61d945b5bb2d286c124b76e62 -r68eab07e7b1947fed0f85b75d1856e7674ddebf7 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 4b181ebda12a35a61d945b5bb2d286c124b76e62) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 68eab07e7b1947fed0f85b75d1856e7674ddebf7) @@ -383,6 +383,15 @@ properties.put("organisation.organisationState.organisationStateId",stateId); return baseDAO.findByProperties(UserOrganisation.class,properties); } + + public List getUserOrganisationsForUserByTypeAndStatusAndParent(String login, Integer typeId, Integer stateId, Integer parentOrgId) { + Map properties = new HashMap(); + properties.put("user.login",login); + properties.put("organisation.organisationType.organisationTypeId",typeId); + properties.put("organisation.organisationState.organisationStateId",stateId); + properties.put("organisation.parentOrganisation.organisationId",parentOrgId); + return baseDAO.findByProperties(UserOrganisation.class,properties); + } public User getUserByLogin(String login) { List results = baseDAO.findByProperty(User.class,"login",login);