|
|
@@ -73,8 +73,9 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
|
.between(StringUtils.isNotBlank(startTime)&&StringUtils.isNotBlank(endTime),MceReceive::getCreateTime,
|
|
|
startTime,endTime)
|
|
|
.eq(StringUtils.isNotBlank(infoType),MceReceive::getInfoType, infoType)
|
|
|
-// .eq(MceReceive::getReceiverId, SecurityUtils.getUserId())
|
|
|
- .in(CollectionUtils.isNotEmpty(contentIds),MceReceive::getContentId,contentIds);
|
|
|
+ .eq(MceReceive::getReceiverId, SecurityUtils.getUserId())
|
|
|
+ .in(CollectionUtils.isNotEmpty(contentIds),MceReceive::getContentId,contentIds)
|
|
|
+ .orderByDesc(MceReceive::getId);
|
|
|
// .inSql(StringUtils.isNotBlank(infoTitle),MceReceive::getContentId,"SELECT id FROM mce_content WHERE " +
|
|
|
// "info_title like '%" + infoTitle + "%' AND tenant_id = "+SecurityUtils.getTenantId()+"");
|
|
|
page = this.page(page,lambdaQuery);
|
