diff --git a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java index dcc71019..bb8ecc90 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/controller/LawsFriendlyLinksController.java @@ -76,6 +76,8 @@ public class LawsFriendlyLinksController extends JeroController pageList = lawsFriendlyLinksService.queryPageList(lawsFriendlyLinks, req, pageNo, pageSize); + List records = pageList.getRecords().stream().sorted(Comparator.comparing(LawsFriendlyLinks::getSort)).collect(Collectors.toList()); + pageList.setRecords(records); return Result.OK(pageList); } diff --git a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsFriendlyLinksServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsFriendlyLinksServiceImpl.java index d28d14a4..620e3d86 100644 --- a/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsFriendlyLinksServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/sys/service/impl/LawsFriendlyLinksServiceImpl.java @@ -84,7 +84,6 @@ public class LawsFriendlyLinksServiceImpl extends ServiceImpl queryPageList(LawsFriendlyLinks lawsFriendlyLinks, HttpServletRequest req, Integer pageNo, Integer pageSize) { Page page = new Page(pageNo, pageSize); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(lawsFriendlyLinks, req.getParameterMap()); - queryWrapper.lambda().orderByAsc(LawsFriendlyLinks::getSort); return page(page,queryWrapper); } }