Merge remote-tracking branch 'origin/test' into test
This commit is contained in:
@@ -37,7 +37,7 @@ public class TbVersionServiceImpl implements TbVersionService {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Map<String, Object> queryAllPage(TbVersionQueryCriteria criteria) {
|
public Map<String, Object> queryAllPage(TbVersionQueryCriteria criteria) {
|
||||||
Pageable pageable = PageRequest.of(criteria.getPage(), criteria.getPageSize(), Sort.by("createdAt"));
|
Pageable pageable = PageRequest.of(criteria.getPage(), criteria.getPageSize(), Sort.by(Sort.Direction.DESC, "createdAt"));
|
||||||
Page<TbVersion> page = tbVersionRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
|
Page<TbVersion> page = tbVersionRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable);
|
||||||
return PageUtil.toPage(page.map(tbVersionMapper::toDto));
|
return PageUtil.toPage(page.map(tbVersionMapper::toDto));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user