X-Git-Url: https://gerrit.onap.org/r/gitweb?p=portal.git;a=blobdiff_plain;f=ecomp-portal-BE-os%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fservice%2FUserServiceImpl.java;h=fccd4ff8c32c203cea94682bf8e47cead2b093e2;hp=b5ccfc028ad56a8e296520a558cbe0a9cf3f38cc;hb=a59bc3e85eaf33c0a38063e5c30fe890588a0eb1;hpb=4be6886a011ddbc4543e8c27b759a27ff3415c18

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
index b5ccfc02..fccd4ff8 100644
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/portal/service/UserServiceImpl.java
@@ -159,9 +159,12 @@ public class UserServiceImpl implements UserService {
 
 			List list = null;
 			StringBuffer criteria = new StringBuffer();
-			if (firstName != null)
+			if (firstName != null && lastName != null)
+				criteria.append(" where first_name = '").append(firstName).append("' and last_name = '")
+						.append(lastName).append("'");
+			else if (firstName != null)
 				criteria.append(" where first_name = '").append(firstName).append("'");
-			if (lastName != null)
+			else if (lastName != null)
 				criteria.append(" where last_name = '").append(lastName).append("'");
 			list = getDataAccessService().getList(EPUser.class, criteria.toString(), null, null);
 			return (list == null || list.size() == 0) ? null : list;