charithag
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fix user search by partial filters' (#284) from prathabanKavin/device-mgt-core:searchusersfix1 into master

Browse Source 
Reviewed-on: community/device-mgt-core#284
task-fixes
Pahansith Gunathilake 1 year ago
parent d01e55ed08 8d1d418f67
commit 8475cb5764
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File

8
components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/UserManagementServiceImpl.java
Unescape View File

@ -480,7 +480,7 @@ public class UserManagementServiceImpl implements UserManagementService {
try { try {
if (StringUtils.isNotEmpty(username)) { if (StringUtils.isNotEmpty(username)) {
commonUsers = getUserList(null, username); commonUsers = getUserList(null, "*" + username + "*");
} }
if (commonUsers != null) { if (commonUsers != null) {
commonUsers.remove(Constants.APIM_RESERVED_USER); commonUsers.remove(Constants.APIM_RESERVED_USER);
@ -488,7 +488,7 @@ public class UserManagementServiceImpl implements UserManagementService {
} }
if (!skipSearch(commonUsers) && StringUtils.isNotEmpty(firstName)) { if (!skipSearch(commonUsers) && StringUtils.isNotEmpty(firstName)) {
tempList = getUserList(Constants.USER_CLAIM_FIRST_NAME, firstName); tempList = getUserList(Constants.USER_CLAIM_FIRST_NAME, "*" + firstName + "*");
if (commonUsers == null) { if (commonUsers == null) {
commonUsers = tempList; commonUsers = tempList;
} else { } else {
@ -497,7 +497,7 @@ public class UserManagementServiceImpl implements UserManagementService {
} }
if (!skipSearch(commonUsers) && StringUtils.isNotEmpty(lastName)) { if (!skipSearch(commonUsers) && StringUtils.isNotEmpty(lastName)) {
tempList = getUserList(Constants.USER_CLAIM_LAST_NAME, lastName); tempList = getUserList(Constants.USER_CLAIM_LAST_NAME, "*" + lastName + "*");
if (commonUsers == null || commonUsers.size() == 0) { if (commonUsers == null || commonUsers.size() == 0) {
commonUsers = tempList; commonUsers = tempList;
} else { } else {
@ -506,7 +506,7 @@ public class UserManagementServiceImpl implements UserManagementService {
} }
if (!skipSearch(commonUsers) && StringUtils.isNotEmpty(emailAddress)) { if (!skipSearch(commonUsers) && StringUtils.isNotEmpty(emailAddress)) {
tempList = getUserList(Constants.USER_CLAIM_EMAIL_ADDRESS, emailAddress); tempList = getUserList(Constants.USER_CLAIM_EMAIL_ADDRESS, "*" + emailAddress + "*");
if (commonUsers == null || commonUsers.size() == 0) { if (commonUsers == null || commonUsers.size() == 0) {
commonUsers = tempList; commonUsers = tempList;
} else { } else {

Write Preview
Loading…
Cancel
Save