Merge pull request #91 from nisum-inc/FEATURE/AddedAdminRole

AddedAdminRole

src/main/java/com/nisum/mytime/controller/UserController.java

@@ -44,10 +44,14 @@ public class UserController {
 	public ResponseEntity<EmployeeRoles> getEmployeeRole(@RequestParam("emailId") String emailId)
 			throws MyTimeException {
 		EmployeeRoles employeesRole = userService.getEmployeesRole(emailId);
+		if (employeesRole.getRole() != null && employeesRole.getRole().equalsIgnoreCase("Admin")) {
+			employeesRole.setRole("Admin");
+		} else {
 			String roleName = roleMappingService.getEmployeeRole(employeesRole.getEmployeeId());
 			if (roleName != null) {
 				employeesRole.setRole(roleName);
 			}
+		}
 		System.out.println("emailId" + emailId + "result" + employeesRole);
 		return new ResponseEntity<>(employeesRole, HttpStatus.OK);
 	}