diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java index 7d9474e7..4e58069d 100644 --- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java +++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysAnnouncementController.java @@ -90,18 +90,12 @@ public class SysAnnouncementController { HttpServletRequest req) { Results> result = new Results<>(); sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString()); - QueryWrapper queryWrapper = new QueryWrapper<>(sysAnnouncement); Page page = new Page<>(pageNo,pageSize); - //排序逻辑 处理 - String column = req.getParameter("column"); - String order = req.getParameter("order"); - if(oConvertUtils.isNotEmpty(column) && oConvertUtils.isNotEmpty(order)) { - if("asc".equals(order)) { - queryWrapper.orderByAsc(oConvertUtils.camelToUnderline(column)); - }else { - queryWrapper.orderByDesc(oConvertUtils.camelToUnderline(column)); - } - } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysAnnouncement::getDelFlag, sysAnnouncement.getDelFlag()); + queryWrapper.like(StringUtils.isNotBlank(sysAnnouncement.getTitile()) + ,SysAnnouncement::getTitile, sysAnnouncement.getTitile()); + queryWrapper.orderByDesc(SysAnnouncement::getCreateTime); IPage pageList = sysAnnouncementService.page(page, queryWrapper); result.setSuccess(true); result.setResult(pageList);