|
|
@ -64,8 +64,8 @@ public class CMSJournalService {
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public Result<PageResult<JournalVO>> search(JournalQueryModel param, int page, int size) {
|
|
|
|
public Result<PageResult<JournalVO>> search(JournalQueryModel param, int page, int size) {
|
|
|
|
List<JournalVO> result = new ArrayList<>();
|
|
|
|
List<JournalVO> result = new ArrayList<>();
|
|
|
|
Sort sort = new Sort(Sort.Direction.DESC, "createTime");
|
|
|
|
// Sort sort = new Sort(Sort.Direction.DESC, "journalNo");
|
|
|
|
PageRequest pageRequest = PageRequest.of(page - 1, size, sort);
|
|
|
|
PageRequest pageRequest = PageRequest.of(page - 1, size);
|
|
|
|
Page<Journal> journalPage;
|
|
|
|
Page<Journal> journalPage;
|
|
|
|
if (!Objects.isNull(param)) {
|
|
|
|
if (!Objects.isNull(param)) {
|
|
|
|
List<String> journalIdsByTags = null;
|
|
|
|
List<String> journalIdsByTags = null;
|
|
|
|