|
|
@ -308,9 +308,9 @@ public class MessageListService extends MybatisBaseService<MessageListMapper, Me |
|
|
|
QueryWrapper<MessageList> qw = new QueryWrapper<>(); |
|
|
|
qw.eq("ml.receiverSid", pq.getParams().getUserSid()); |
|
|
|
qw.eq("m.msgTypeSid", pq.getParams().getMsgTypeSid()); |
|
|
|
if(StringUtils.isNotBlank(pq.getParams().getOrgPath())){ |
|
|
|
qw.and(wrapper -> wrapper.isNull("ml.receiverDeptSid").or().eq("ml.receiverDeptSid",pq.getParams().getOrgPath()).or().eq("ml.receiverDeptSid", "")); |
|
|
|
} |
|
|
|
// if(StringUtils.isNotBlank(pq.getParams().getOrgPath())){
|
|
|
|
// qw.and(wrapper -> wrapper.isNull("ml.receiverDeptSid").or().eq("ml.receiverDeptSid",pq.getParams().getOrgPath()).or().eq("ml.receiverDeptSid", ""));
|
|
|
|
// }
|
|
|
|
IPage<AppMessageListQuery> iPage = PagerUtil.queryToPage(pq); |
|
|
|
IPage<AppMessageListVo> page = baseMapper.getAppMsgListByUserSid(iPage, qw); |
|
|
|
PagerVo<AppMessageListVo> pagerVo = PagerUtil.pageToVo(page, null); |
|
|
|