X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FFunctionalMenuController.java;h=3442d5a681dd8512be90a939a6b30d92148e034b;hb=0a538f1113c1236e1ce8ba589a9446f6848e1844;hp=3233a5fea0ed8288d9a1e6995f7880776f1dc874;hpb=e4fae46259c1d5b877e2ac6c394e2f43cea16d22;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/FunctionalMenuController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/FunctionalMenuController.java
index 3233a5fe..3442d5a6 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/FunctionalMenuController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/FunctionalMenuController.java
@@ -573,14 +573,20 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
             String lastNameStr = null;
             String emailStr = null;
             String lastLogin = null;
+            boolean isSystemUser = false;
 			EPUser user = EPUserUtils.getUserSession(request);
 			firstNameStr = user.getFirstName();
 			lastNameStr = user.getLastName();
 			orgUserIdStr = user.getOrgUserId();
+			isSystemUser = user.isSystemUser();
 			emailStr = user.getEmail();
 			if (emailStr == null || emailStr.equals("")) {
-				EPUser userResult = searchService.searchUserByUserId(orgUserIdStr);
-				emailStr = userResult.getEmail();
+				try {
+					EPUser userResult = searchService.searchUserByUserId(orgUserIdStr);
+					emailStr = userResult.getEmail();
+				}catch(Exception ex) { 
+					logger.error(EELFLoggerDelegate.errorLogger, "searchUserByUserId call failed", ex); 
+				} 
 			}
 			SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy hh:mm:ss Z a");
 			Date lastLoginDate = user.getLastLoginDate();
@@ -620,6 +626,7 @@ public class FunctionalMenuController extends EPRestrictedBaseController {
 			map.put("userId",
 					orgUserIdStr != null ? orgUserIdStr : (orgUserIdSC != null ? orgUserIdSC.getCvalue() : null));
 			map.put("last_login", lastLogin);
+			map.put("isSystemUser", String.valueOf(isSystemUser));
 			JSONObject j = new JSONObject(map);
 			fnMenuStaticResponse = j.toString();
 			// Be chatty in the log