|
|
@ -49,6 +49,7 @@ public class UserSearchServiceImpl implements UserSearchService { |
|
|
|
* 组装的条件在 queryParameter 中数组下标第一位,格式一定是 { fieldName: null, operator: 'and', criteria: [...] }; |
|
|
|
*/ |
|
|
|
List<Criteria> criterias = queryParameter.getCriterias().get(0).getCriteria(); |
|
|
|
if (criterias!=null && criterias.size() > 0) { |
|
|
|
for (Criteria criteria: criterias) { |
|
|
|
if (criteria.getFieldName()!=null) { |
|
|
|
Boolean isOrgCriteria = Arrays.stream(SearchConstant.ORG_CRITERIA_FIELD_NAMES).anyMatch(criteria.getFieldName()::equals); |
|
|
@ -77,6 +78,9 @@ public class UserSearchServiceImpl implements UserSearchService { |
|
|
|
} else { |
|
|
|
return queryParameter; |
|
|
|
} |
|
|
|
} else { |
|
|
|
return queryParameter; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
private void addOtherCriteria(List<Criteria> userCriteriaList, QueryParameter queryParameter) { |
|
|
|