gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.0.4】【message】修复orderby问题

pull/17/head^2
fengshuonan 2021-05-21 16:24:23 +08:00
parent 50c54dab5a
commit ea50aff97d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
kernel-s-message/message-sdk-db/src/main/java/cn/stylefeng/roses/kernel/message/db/service/impl/SysMessageServiceImpl.java
View File

@ -76,26 +76,26 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
@Override @Override
public SysMessage detail(MessageRequest messageRequest) { public SysMessage detail(MessageRequest messageRequest) {
LambdaQueryWrapper<SysMessage> queryWrapper = this.createWrapper(messageRequest); LambdaQueryWrapper<SysMessage> queryWrapper = this.createWrapper(messageRequest, true);
return this.getOne(queryWrapper, false); return this.getOne(queryWrapper, false);
} }
@Override @Override
public PageResult<SysMessage> findPage(MessageRequest messageRequest) { public PageResult<SysMessage> findPage(MessageRequest messageRequest) {
LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest); LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest, true);
Page<SysMessage> page = this.page(PageFactory.defaultPage(), wrapper); Page<SysMessage> page = this.page(PageFactory.defaultPage(), wrapper);
return PageResultFactory.createPageResult(page); return PageResultFactory.createPageResult(page);
} }
@Override @Override
public List<SysMessage> findList(MessageRequest messageRequest) { public List<SysMessage> findList(MessageRequest messageRequest) {
LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest); LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest, true);
return this.list(wrapper); return this.list(wrapper);
} }
@Override @Override
public Integer findCount(MessageRequest messageRequest) { public Integer findCount(MessageRequest messageRequest) {
LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest); LambdaQueryWrapper<SysMessage> wrapper = createWrapper(messageRequest, false);
return this.count(wrapper); return this.count(wrapper);
} }
@ -119,14 +119,16 @@ public class SysMessageServiceImpl extends ServiceImpl<SysMessageMapper, SysMess
* @author liuhanqing * @author liuhanqing
* @date 2021/1/8 14:16 * @date 2021/1/8 14:16
*/ */
private LambdaQueryWrapper<SysMessage> createWrapper(MessageRequest messageRequest) { private LambdaQueryWrapper<SysMessage> createWrapper(MessageRequest messageRequest, boolean needOrderBy) {
LambdaQueryWrapper<SysMessage> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<SysMessage> queryWrapper = new LambdaQueryWrapper<>();
// 查询未删除的 // 查询未删除的
queryWrapper.ne(SysMessage::getDelFlag, YesOrNotEnum.Y.getCode()); queryWrapper.ne(SysMessage::getDelFlag, YesOrNotEnum.Y.getCode());
// 按发送事件倒序 // 按发送事件倒序
queryWrapper.orderByDesc(SysMessage::getMessageSendTime); if (needOrderBy) {
queryWrapper.orderByDesc(SysMessage::getMessageSendTime);
}
if (ObjectUtil.isEmpty(messageRequest)) { if (ObjectUtil.isEmpty(messageRequest)) {
return queryWrapper; return queryWrapper;