X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fservice%2FEPRoleServiceImpl.java;h=92cbe90e95912a1012c4aeaefea742d850a82f64;hb=ace89e59c9838b666ddd02c08fd5e39a94eee39a;hp=3e73d8d25d1469a5d400a1042fe785c213aae1e8;hpb=21a8761f684745bb300e075c7e98ad897ace9eed;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPRoleServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPRoleServiceImpl.java
index 3e73d8d2..92cbe90e 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPRoleServiceImpl.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPRoleServiceImpl.java
@@ -33,7 +33,7 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalapp.portal.service;
 
@@ -65,6 +65,9 @@ public class EPRoleServiceImpl implements EPRoleService {
 
 	@Autowired
 	private DataAccessService dataAccessService;
+	
+	@Autowired
+	ExternalAccessRolesService externalAccessRolesService;
 
 	@SuppressWarnings("unchecked")
 	public List<RoleFunction> getRoleFunctions() {
@@ -157,9 +160,16 @@ public class EPRoleServiceImpl implements EPRoleService {
 		params.put("appId", appId.toString());
 		params.put("roleName", roleName);
 		portalParams.put("appRoleName", roleName);
-		if (appId == 1 || roleName.equals(PortalConstants.ADMIN_ROLE)) {
+		
+		List<EPRole> roleList = externalAccessRolesService.getPortalAppRoleInfo(PortalConstants.ACCOUNT_ADMIN_ROLE_ID);
+		EPRole role = new EPRole();
+		if(roleList.size()>0){
+		 role = roleList.get(0);}
+		 logger.debug(EELFLoggerDelegate.debugLogger, "Requested RoleName is  "+role.getName());
+		 
+		if (appId == 1 || roleName.equals(role.getName())) {
 			roles = (List<EPRole>) dataAccessService.executeNamedQuery("getPortalAppRoles", portalParams, null);
-		} else if (appId != 1 && !roleName.equals(PortalConstants.ADMIN_ROLE)) {
+		} else if (appId != 1 && !roleName.equals(role.getName())) {
 			roles = (List<EPRole>) dataAccessService.executeNamedQuery("getAppRoles", params, null);
 		}
 		int resultsCount = (roles == null ? 0 : roles.size());