Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java =================================================================== diff -u -r9ee21b9038a403027299fd2d3121ad638d1c28b1 -r950ee64939e4b71aec82daa0dce40ddfe554bff8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java (.../OrganisationDAO.java) (revision 950ee64939e4b71aec82daa0dce40ddfe554bff8) @@ -90,7 +90,7 @@ childOrganisation.setParentOrganisation(parentOrganisation); iter.remove(); } - getHibernateTemplate().delete(organisation); + delete(organisation); } /** @@ -107,4 +107,9 @@ return null; } + public List getOrganisationsByType(Integer organisationTypeId) { + String queryString = "from Organisation o where o.organisationType.organisationTypeId=?"; + return getHibernateTemplate().find(queryString,organisationTypeId); + } + } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java =================================================================== diff -u -r9ee21b9038a403027299fd2d3121ad638d1c28b1 -r950ee64939e4b71aec82daa0dce40ddfe554bff8 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java (.../UserOrganisationDAO.java) (revision 9ee21b9038a403027299fd2d3121ad638d1c28b1) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserOrganisationDAO.java (.../UserOrganisationDAO.java) (revision 950ee64939e4b71aec82daa0dce40ddfe554bff8) @@ -113,4 +113,9 @@ delete(getUserOrganisationById(userOrganisationId)); } + public List getUserOrganisationsByType(Integer organisationTypeId) { + String queryString = "from UserOrganisation uo where uo.organisation.organisationType.organisationTypeId=?"; + return getHibernateTemplate().find(queryString,organisationTypeId); + } + }