Return clients based on Office Hierarchy
This commit is contained in:
@@ -75,9 +75,10 @@ public class ClientsApiResource {
|
|||||||
@QueryParam("externalId") final String externalId,
|
@QueryParam("externalId") final String externalId,
|
||||||
@QueryParam("displayName") final String displayName,
|
@QueryParam("displayName") final String displayName,
|
||||||
@QueryParam("firstName") final String firstName,
|
@QueryParam("firstName") final String firstName,
|
||||||
@QueryParam("lastName") final String lastName) {
|
@QueryParam("lastName") final String lastName,
|
||||||
|
@QueryParam("underHierarchy") final String hierarchy) {
|
||||||
|
|
||||||
final String extraCriteria = getClientCriteria(sqlSearch, officeId, externalId, displayName, firstName, lastName);
|
final String extraCriteria = getClientCriteria(sqlSearch, officeId, externalId, displayName, firstName, lastName, hierarchy);
|
||||||
|
|
||||||
Set<String> responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo.getQueryParameters());
|
Set<String> responseParameters = ApiParameterHelper.extractFieldsForResponseIfProvided(uriInfo.getQueryParameters());
|
||||||
if (responseParameters.isEmpty()) {
|
if (responseParameters.isEmpty()) {
|
||||||
@@ -92,7 +93,7 @@ public class ClientsApiResource {
|
|||||||
|
|
||||||
private String getClientCriteria(String sqlSearch, Integer officeId,
|
private String getClientCriteria(String sqlSearch, Integer officeId,
|
||||||
String externalId, String displayName, String firstName,
|
String externalId, String displayName, String firstName,
|
||||||
String lastName) {
|
String lastName, String hierarchy) {
|
||||||
|
|
||||||
String extraCriteria = "";
|
String extraCriteria = "";
|
||||||
|
|
||||||
@@ -112,6 +113,9 @@ public class ClientsApiResource {
|
|||||||
+ sqlEncodeString(firstName);
|
+ sqlEncodeString(firstName);
|
||||||
if (lastName != null)
|
if (lastName != null)
|
||||||
extraCriteria += " and lastname like " + sqlEncodeString(lastName);
|
extraCriteria += " and lastname like " + sqlEncodeString(lastName);
|
||||||
|
if(hierarchy != null){
|
||||||
|
extraCriteria += " and o.hierarchy like " + sqlEncodeString(hierarchy+"%");
|
||||||
|
}
|
||||||
|
|
||||||
if (StringUtils.isNotBlank(extraCriteria))
|
if (StringUtils.isNotBlank(extraCriteria))
|
||||||
extraCriteria = extraCriteria.substring(4);
|
extraCriteria = extraCriteria.substring(4);
|
||||||
|
|||||||
Reference in New Issue
Block a user