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

AddedAdminRole

Merge pull request #91 from nisum-inc/FEATURE/AddedAdminRole
AddedAdminRole
aafbaa63 · rsayannagari-nisum-com · GitHub · ee05934f · 7c040491 · aafbaa63
Unverified Commit aafbaa63 authored Jul 31, 2018 by rsayannagari-nisum-com Committed by GitHub Jul 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

UserController.java ...main/java/com/nisum/mytime/controller/UserController.java +7 -3

No files found.
--- a/src/main/java/com/nisum/mytime/controller/UserController.java
+++ b/src/main/java/com/nisum/mytime/controller/UserController.java
@@ -44,9 +44,13 @@ public class UserController {
 	public ResponseEntity<EmployeeRoles> getEmployeeRole(@RequestParam("emailId") String emailId)
 			throws MyTimeException {
 		EmployeeRoles employeesRole = userService.getEmployeesRole(emailId);
-		String roleName = roleMappingService.getEmployeeRole(employeesRole.getEmployeeId());
-		if (roleName != null) {
-			employeesRole.setRole(roleName);
+		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);