wangli/msg-center-plat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(linkzo): 修复新send查询分页

Browse Source
This commit is contained in:
zhansihu 2023-08-22 18:28:48 +08:00
parent 2d8ad4c227
commit 3622afdec6
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
inside-notices/src/main/java/cn/axzo/msg/center/inside/notices/service/impl/MessageRecordServiceImpl.java
View File

@ -593,6 +593,7 @@ public class MessageRecordServiceImpl implements MessageRecordService {
.eq(Objects.nonNull(request.getMsgType()), MessageRecord::getType, MsgTypeEnum.valueOf(request.getMsgType()))
.eq(Objects.nonNull(request.getToId()), MessageRecord::getToId, request.getToId())
.eq(Objects.nonNull(request.getTenantId()), MessageRecord::getTenantId, request.getTenantId())
.in(MessageRecord::getState, MsgStateEnum.HAS_BEEN_SENT, MsgStateEnum.RECEIVED)
.count();
}

4
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/MessageRecordDao.java
View File

@ -17,6 +17,7 @@ import cn.axzo.msg.center.domain.enums.ModuleBizTypeEnum;
import cn.axzo.msg.center.domain.persistence.BaseEntity;
import cn.axzo.msg.center.domain.request.InsideCmsReadMsgReq;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@ -126,7 +127,8 @@ public class MessageRecordDao extends
}
public IPage<MessageRecordRes> querySent(QueryMessageRecordReq request){
return baseMapper.querySent(request);
IPage<MessageRecordRes> page = new Page<>(request.getPage(), request.getPageSize());
return baseMapper.querySent(page,request);
}
}

2
msg-center-dal/src/main/java/cn/axzo/msg/center/dal/mapper/MessageRecordMapper.java
View File

@ -48,6 +48,6 @@ public interface MessageRecordMapper extends BaseMapper<MessageRecord>{
int updateHasRead(@Param("req") UpdateReadDTO request);
IPage<MessageNewResDTO> queryUnReadList(@Param("req") QueryMessageRecordReq req, IPage page);
IPage<MessageRecordRes> querySent(QueryMessageRecordReq request);
IPage<MessageRecordRes> querySent(IPage<MessageRecordRes> page, QueryMessageRecordReq request);
}

4
msg-center-dal/src/main/resources/mapper/MessageRecordMapper.xml
View File

@ -242,7 +242,9 @@
<if test="req.tenantId != null and req.tenantId > 0">
tenant_id = #{req.tenantId}
</if>
and module_id = #{req.moduleId}
<if test="req.moduleId != null and req.moduleId > 0">
module_id = #{req.moduleId}
</if>
and state=2
and is_delete = 0
order by create_at desc,id desc