|
|
|
@ -48,7 +48,7 @@ public class DmpCriteriaMapper {
|
|
|
|
|
if (columnOrderings.getFieldOrderings() != null && columnOrderings.getFieldOrderings().length > 0) {
|
|
|
|
|
for (Ordering ordering: columnOrderings.getFieldOrderings()) {
|
|
|
|
|
SortCriteria sortCriteria1 = new SortCriteria();
|
|
|
|
|
sortCriteria1.setFieldName(ordering.getFieldName() + ".keyword");
|
|
|
|
|
sortCriteria1.setFieldName(ordering.getFieldName() + (ordering.getFieldName().contains("label") ?".keyword" : ""));
|
|
|
|
|
sortCriteria1.setColumnType(ordering.getColumnType() != null ? SortCriteria.ColumnType.valueOf(ordering.getColumnType().name()): SortCriteria.ColumnType.COLUMN);
|
|
|
|
|
sortCriteria1.setOrderByType(SortCriteria.OrderByType.valueOf(ordering.getOrderByType().name()));
|
|
|
|
|
sortCriteria.add(sortCriteria1);
|
|
|
|
|