diff --git a/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageUtil.java b/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageUtil.java index 4e10501a..feee2bec 100644 --- a/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageUtil.java +++ b/cutejava/cutejava-common/src/main/java/cn/odboy/util/PageUtil.java @@ -15,8 +15,8 @@ public class PageUtil extends cn.hutool.core.util.PageUtil { * List 分页 */ public static List paging(int page, int size, List list) { - int fromIndex = page * size; - int toIndex = page * size + size; + int fromIndex = (page - 1) * size; + int toIndex = (page - 1) * size + size; if (fromIndex > list.size()) { return Collections.emptyList(); } else if (toIndex >= list.size()) { diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/rest/OnlineController.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/rest/OnlineController.java index acb8b100..a933a69d 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/rest/OnlineController.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/rest/OnlineController.java @@ -2,7 +2,7 @@ package cn.odboy.modules.security.rest; import cn.odboy.base.PageResult; import cn.odboy.model.system.dto.OnlineUserDto; -import cn.odboy.modules.security.service.impl.OnlineUserServiceImpl; +import cn.odboy.modules.security.service.OnlineUserService; import cn.odboy.util.EncryptUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -23,8 +23,7 @@ import java.util.Set; @RequestMapping("/auth/online") @Api(tags = "系统:在线用户管理") public class OnlineController { - - private final OnlineUserServiceImpl onlineUserService; + private final OnlineUserService onlineUserService; @ApiOperation("查询在线用户") @GetMapping diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/service/impl/OnlineUserServiceImpl.java b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/service/impl/OnlineUserServiceImpl.java index 21f7f0ea..cd00a503 100644 --- a/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/service/impl/OnlineUserServiceImpl.java +++ b/cutejava/cutejava-system/src/main/java/cn/odboy/modules/security/service/impl/OnlineUserServiceImpl.java @@ -48,10 +48,8 @@ public class OnlineUserServiceImpl implements OnlineUserService { @Override public PageResult getAll(String username, Pageable pageable) { List onlineUserDtos = getAll(username); - return PageUtil.toPage( - PageUtil.paging(pageable.getPageNumber(), pageable.getPageSize(), onlineUserDtos), - onlineUserDtos.size() - ); + List paging = PageUtil.paging(pageable.getPageNumber(), pageable.getPageSize(), onlineUserDtos); + return PageUtil.toPage(paging, onlineUserDtos.size()); } @Override