|
|
|
@ -60,7 +60,7 @@ public class MesNotifyMessageServiceImpl extends BaseServiceImpl<MesNotifyMessag |
|
|
|
.and(wrapper -> wrapper |
|
|
|
.and(wrapper -> wrapper |
|
|
|
.eq(MesNotifyMessageEntity::getReceiveUserId, mesNotifyMessage.getReceiveUserId()) |
|
|
|
.eq(MesNotifyMessageEntity::getReceiveUserId, mesNotifyMessage.getReceiveUserId()) |
|
|
|
.or() |
|
|
|
.or() |
|
|
|
.eq(MesNotifyMessageEntity::getReceiveRoleName, mesNotifyMessage.getReceiveRoleName()) |
|
|
|
.like(MesNotifyMessageEntity::getReceiveRoleName, mesNotifyMessage.getReceiveRoleName()) |
|
|
|
) |
|
|
|
) |
|
|
|
.orderByDesc(MesNotifyMessageEntity::getCreateTime)); |
|
|
|
.orderByDesc(MesNotifyMessageEntity::getCreateTime)); |
|
|
|
Page<MesNotifyMessageVO> page1 = new Page<>(); |
|
|
|
Page<MesNotifyMessageVO> page1 = new Page<>(); |
|
|
|
|