Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -rbd8f520de2f68177edd4b56458ba2427033b7286 -r69750cb779c57e74f87c9f45f4498d54d378d7ee --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision bd8f520de2f68177edd4b56458ba2427033b7286) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 69750cb779c57e74f87c9f45f4498d54d378d7ee) @@ -36,6 +36,7 @@ import org.lamsfoundation.lams.usermanagement.UserOrganisation; import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.usermanagement.dto.UserManageBean; /** * @version @@ -289,4 +290,6 @@ */ public SupportedLocale getSupportedLocale(String language, String country); + public List getUserManageBeans(Integer orgId); + } Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -rbd8f520de2f68177edd4b56458ba2427033b7286 -r69750cb779c57e74f87c9f45f4498d54d378d7ee --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision bd8f520de2f68177edd4b56458ba2427033b7286) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 69750cb779c57e74f87c9f45f4498d54d378d7ee) @@ -45,10 +45,10 @@ import org.lamsfoundation.lams.usermanagement.UserOrganisationRole; import org.lamsfoundation.lams.usermanagement.Workspace; import org.lamsfoundation.lams.usermanagement.WorkspaceFolder; -import org.lamsfoundation.lams.usermanagement.WorkspaceWorkspaceFolder; import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO; import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTOFactory; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.usermanagement.dto.UserManageBean; import org.lamsfoundation.lams.util.MessageService; /** @@ -201,6 +201,7 @@ } + @SuppressWarnings("unchecked") private void getChildOrganisations(User user, Organisation org, List restrictToRoleNames, List restrictToClassIds, List dtolist) { if ( org != null ) { boolean notCheckClassId = restrictToClassIds == null || restrictToClassIds.size() == 0; @@ -420,7 +421,8 @@ return workspace; } - public Organisation saveOrganisation( Organisation organisation, Integer userID ) + @SuppressWarnings("unchecked") + public Organisation saveOrganisation( Organisation organisation, Integer userID ) { if ( organisation.getOrganisationId() == null ) { @@ -461,5 +463,31 @@ List results = findByProperties(SupportedLocale.class,properties); return results.isEmpty() ? null : (SupportedLocale)results.get(0); } + + @SuppressWarnings("unchecked") + public List getUserManageBeans(Integer orgId) { + String query = "select u.userId,u.login,u.title,u.firstName,u.lastName, r " + + "from User u left join u.userOrganisations as uo left join uo.userOrganisationRoles as uor left join uor.role as r where uo.organisation.organisationId=?"; + List list = baseDAO.find(query, orgId); + Map beansMap = new HashMap(); + for(int i=0; i userManageBeans = new ArrayList(); + userManageBeans.addAll(beansMap.values()); + return userManageBeans; + } }