Commit 1e89409f authored by liwei's avatar liwei

修改了未关注时,查看对方动态条数的total问题

parent 228d4e65
......@@ -422,10 +422,27 @@ public class OpmArticleServiceImpl extends ServiceImpl<OpmArticleRepository, Opm
//设置动态的审核状态 只能查看审核通过的
opmArticle.setExamStatus("1");
//设置分页参数 防止前端下滑再次调分页 前端根据total 判断是否还有数据
paginationUtility.setPages(1);
paginationUtility.setSize(noFollowArticleLimit);
IPage<OpmArticle> opmArticleIPage = baseMapper.queryUserArticlePaged(paginationUtility, opmArticle);
if (opmArticleIPage.getTotal() > 0){
// 如果查出来的数据大于0,则判断限制数量是大于10还是小于10 如果大于10.则取整,例如11则取20
// 判断noFollowArticleLimit是否能整除10
if (noFollowArticleLimit > 0 && noFollowArticleLimit < 10){
// 限制条数小于10
opmArticleIPage.setTotal(noFollowArticleLimit);
} else {
// 限制条数大于10
if (noFollowArticleLimit % 10 == 0){
// 如果能整除,则取整
opmArticleIPage.setTotal(noFollowArticleLimit);
} else {
// 如果不能整除,则取整加一 例如11,取20
noFollowArticleLimit = ((noFollowArticleLimit / 10)+1)*10;
opmArticleIPage.setTotal(noFollowArticleLimit);
}
}
} else {
opmArticleIPage.setTotal(0);
}
return opmArticleIPage;
} else if(StringUtils.isNotEmpty(isFollowed) && isFollowed.equals("1")){
//2.已关注
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment