Merge remote-tracking branch 'origin/fix_20230911_UAT' into fix_20230911_UAT
This commit is contained in:
+7
-3
@@ -44,8 +44,11 @@ import org.jetbrains.annotations.NotNull;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Component;
|
||||
|
||||
import javax.swing.*;
|
||||
import java.util.*;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
@@ -224,7 +227,8 @@ public class DocumentSearchServiceImpl implements IDocumentSearchService {
|
||||
mapSortTemp.put(orderByField,mapSort);
|
||||
}
|
||||
}else{
|
||||
mapSortTemp.put("create_time","desc");
|
||||
mapSortTemp.put("serial_number.keyword","asc");
|
||||
// mapSortTemp.put("create_time","desc");
|
||||
}
|
||||
sort.putAll(mapSortTemp);
|
||||
jsonArrySort.add(sort);
|
||||
|
||||
Reference in New Issue
Block a user