From 83efd29d0c77236716d029b6c0309238e3e4caa3 Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Sat, 6 May 2023 11:39:44 +0800
Subject: [PATCH] =?UTF-8?q?fix=2068468=20=E7=B3=BB=E7=BB=9F=E9=80=9A?=
 =?UTF-8?q?=E5=91=8A--=E6=9F=A5=E8=AF=A2=E5=BB=BA=E8=AE=AE=E6=94=B9?=
 =?UTF-8?q?=E6=88=90=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysAnnouncementController.java    | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

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<IPage<SysAnnouncement>> result = new Results<>();
 		sysAnnouncement.setDelFlag(CommonConstant.DEL_FLAG_0.toString());
-		QueryWrapper<SysAnnouncement> queryWrapper = new QueryWrapper<>(sysAnnouncement);
 		Page<SysAnnouncement> 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<SysAnnouncement> queryWrapper = new LambdaQueryWrapper<>();
+		queryWrapper.eq(SysAnnouncement::getDelFlag, sysAnnouncement.getDelFlag());
+		queryWrapper.like(StringUtils.isNotBlank(sysAnnouncement.getTitile())
+				,SysAnnouncement::getTitile, sysAnnouncement.getTitile());
+		queryWrapper.orderByDesc(SysAnnouncement::getCreateTime);
 		IPage<SysAnnouncement> pageList = sysAnnouncementService.page(page, queryWrapper);
 		result.setSuccess(true);
 		result.setResult(pageList);