|
@@ -64,8 +64,21 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
|
private MceReceiveMapper mceReceiveMapper;
|
|
|
|
|
|
@Override
|
|
|
- public CommonPage<Object> mceList(String infoTitle, String infoType, String startTime, String endTime, Integer id, Integer current, Integer size) {
|
|
|
+ public CommonPage<Object> mceList(String infoTitle, String infoType, String startTime, String endTime, Integer id, Integer infoId, Integer current, Integer size) {
|
|
|
List<Object> list = new ArrayList<>();
|
|
|
+
|
|
|
+ if (infoId != null) {
|
|
|
+ LambdaQueryWrapper<MceReceive> query = Wrappers.lambdaQuery();
|
|
|
+ query.select(MceReceive::getContentId).eq(MceReceive::getId, infoId);
|
|
|
+ MceReceive mceReceive = mceReceiveMapper.selectOne(query);
|
|
|
+ if (mceReceive != null) {
|
|
|
+ id = mceReceive.getContentId();
|
|
|
+ } else {
|
|
|
+ log.error("消息内容已不存在!消息id:{}", infoId);
|
|
|
+ throw new BusinessException("消息内容已不存在!");
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
LambdaQueryWrapper<MceContent> lambdaQuery1 = Wrappers.lambdaQuery();
|
|
|
lambdaQuery1.select(MceContent::getId, MceContent::getInfoTitle, MceContent::getInfoContent)
|
|
|
.like(StringUtils.isNotBlank(infoTitle), MceContent::getInfoTitle, infoTitle)
|
|
@@ -313,7 +326,6 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
// 筛选符合用户ID条件的用户
|
|
|
List<Long> targetUserIds = mceRequestVO.getUserIds();
|
|
|
userIdList.retainAll(targetUserIds);
|