ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java
@@ -23,6 +23,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.bean.BeanUtils; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.redis.annotation.DistributedLock; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.order.feignClient.OrderClient; import com.ruoyi.order.feignClient.RemoteOrderGoodsClient; ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/AppUserServiceImpl.java
@@ -22,6 +22,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.core.web.page.PageInfo; import com.ruoyi.common.redis.annotation.DistributedLock; import com.ruoyi.common.redis.service.RedisService; import com.ruoyi.common.security.service.TokenService; import com.ruoyi.other.api.domain.*; ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/GoodsServiceImpl.java
@@ -169,17 +169,29 @@ PageInfo<GoodsVO> pageInfo = new PageInfo<>(); pageInfo.setSize(search.getPageSize()); pageInfo.setTotal(list.size()); Integer pageSize = search.getPageSize(); Integer pageNum = (search.getPageCurr() - 1) * pageSize; if(list.size() >= (pageNum + 1) * pageSize){ list = list.subList(pageNum, pageNum + pageSize); }else if(pageNum < list.size() && list.size() < (pageNum + 1) * pageSize){ list = list.subList(pageNum, list.size()); }else{ list = new ArrayList<>(); int pageSize = search.getPageSize(); int pageCurr = search.getPageCurr(); // 计算起始索引 int pageNum = (pageCurr - 1) * pageSize; // 检查 pageNum 是否合法 if (pageNum < 0 || pageNum >= list.size()) { // 如果 pageNum 不合法，返回空列表 pageInfo.setRecords(new ArrayList<>()); return pageInfo; } return pageInfo.setRecords(list); // 计算结束索引 int endIndex = Math.min(pageNum + pageSize, list.size()); // 获取分页数据 List<GoodsVO> pageList = list.subList(pageNum, endIndex); // 设置分页结果 pageInfo.setRecords(pageList); return pageInfo; } @Override
