【fix】优化代码,删掉不需要的内容
【modify】修改公告标题模糊查询的逻辑
This commit is contained in:
+11
-5
@@ -90,12 +90,18 @@ 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);
|
||||
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);
|
||||
//排序逻辑 处理
|
||||
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));
|
||||
}
|
||||
}
|
||||
IPage<SysAnnouncement> pageList = sysAnnouncementService.page(page, queryWrapper);
|
||||
result.setSuccess(true);
|
||||
result.setResult(pageList);
|
||||
|
||||
+2
-3
@@ -1,8 +1,6 @@
|
||||
package com.jero.modules.system.entity;
|
||||
|
||||
import com.baomidou.mybatisplus.annotation.IdType;
|
||||
import com.baomidou.mybatisplus.annotation.TableId;
|
||||
import com.baomidou.mybatisplus.annotation.TableName;
|
||||
import com.baomidou.mybatisplus.annotation.*;
|
||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||
import com.jero.common.aspect.annotation.Dict;
|
||||
import lombok.Data;
|
||||
@@ -31,6 +29,7 @@ public class SysAnnouncement implements Serializable {
|
||||
* 标题
|
||||
*/
|
||||
@Excel(name = "标题", width = 15)
|
||||
@TableField(condition = SqlCondition.LIKE)
|
||||
private java.lang.String titile;
|
||||
/**
|
||||
* 内容
|
||||
|
||||
-1
@@ -333,7 +333,6 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
||||
copyTreeSelectModel = newTreeSelectModel;
|
||||
}
|
||||
}
|
||||
log.info("aaa");
|
||||
List<TreeSelectModel> treeNodeList = getTreeSelectModels(resultMap);
|
||||
|
||||
return treeNodeList;
|
||||
|
||||
Reference in New Issue
Block a user