Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java =================================================================== diff -u -r3f3f34c22194aeaf302e1fd332925dffd35019aa -r7e259d31f8894bbe8aa368bd503746db01ef05d1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 3f3f34c22194aeaf302e1fd332925dffd35019aa) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java (.../IUserManagementService.java) (revision 7e259d31f8894bbe8aa368bd503746db01ef05d1) @@ -246,6 +246,11 @@ Map> getRolesForUser(Integer userId); /** + * Checks if given user has got any roles in any organisation. + */ + boolean hasUserAnyRoles(Integer userId); + + /** * @param login * @param typeId * @param stateId Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java =================================================================== diff -u -r66f0be031a6a7793d4dc02e7e123508bcdff609d -r7e259d31f8894bbe8aa368bd503746db01ef05d1 --- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 66f0be031a6a7793d4dc02e7e123508bcdff609d) +++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java (.../UserManagementService.java) (revision 7e259d31f8894bbe8aa368bd503746db01ef05d1) @@ -402,7 +402,17 @@ return baseDAO.findByProperties(UserOrganisation.class, properties); } + /** + * Checks if given user has got any roles in any organisation. + */ @Override + public boolean hasUserAnyRoles(Integer userId) { + Map properties = new HashMap<>(); + properties.put("userOrganisation.user.userId", userId); + return baseDAO.countByProperties(UserOrganisationRole.class, properties) > 0; + } + + @Override public List getUserOrganisationsForUserByTypeAndStatusAndParent(String login, Integer typeId, Integer stateId, Integer parentOrgId) { Map properties = new HashMap<>();