|
@@ -110,7 +110,8 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
|
startTime,endTime)
|
|
|
.eq(StringUtils.isNotBlank(infoType),MceContent::getInfoType, infoType)
|
|
|
.eq(MceContent::getCreateBy,SecurityUtils.getUsername())
|
|
|
- .eq(MceContent::getTenantId,SecurityUtils.getTenantId());
|
|
|
+ .eq(MceContent::getTenantId,SecurityUtils.getTenantId())
|
|
|
+ .orderByDesc(MceContent::getId);
|
|
|
page = mceContentService.page(page,lambdaQuery1);
|
|
|
if (CollectionUtils.isNotEmpty(page.getRecords())) {
|
|
|
List<Integer> contentIds = new ArrayList<>();
|
|
@@ -260,8 +261,8 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
|
mceReceive1.setReadFlag(0);
|
|
|
mceReceive1.setInfoType(mceReceiveVO.get("infoType").toString());
|
|
|
mceReceive1.setModuleId((int)mceReceiveVO.get("id"));
|
|
|
- if (mceReceiveVO.containsKey("userId")) {
|
|
|
- mceReceive1.setIssuerId((int)mceReceiveVO.get("userId"));
|
|
|
+ if (mceReceiveVO.containsKey("userName")) {
|
|
|
+ mceReceive1.setIssuerName(mceReceiveVO.get("userName").toString());
|
|
|
}
|
|
|
mceReceive1.setReceiverName(list.get(i).getUserName());
|
|
|
mceReceive1.setCreateBy(SecurityUtils.getUsername());
|
|
@@ -293,4 +294,12 @@ public class MceReceiveServiceImpl extends AbstractCrudService<MceReceiveMapper,
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public boolean removeById(Integer id) {
|
|
|
+ LambdaQueryWrapper<MceReceive> lambdaQuery = Wrappers.lambdaQuery();
|
|
|
+ lambdaQuery.eq(MceReceive::getContentId,id);
|
|
|
+ this.remove(lambdaQuery);
|
|
|
+ return mceContentService.removeById(id);
|
|
|
+ }
|
|
|
}
|