diff --git a/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java b/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java index b9d205f89..e305b6833 100644 --- a/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java @@ -65,7 +65,7 @@ public class AuthRoleServiceImpl extends Service implements AuthRoleService { List authRolePOS = getAuthRoleMapper().list(param); int total = authRolePOS.size(); - List collect = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), authRolePOS) + List list = SalaryPageUtil.subList(param.getCurrent(), param.getPageSize(), authRolePOS) .stream().map(po -> { Long roleId = po.getId(); AuthMemberQueryParam roleQueryParam = AuthMemberQueryParam.builder().roleId(roleId).build(); @@ -84,7 +84,8 @@ public class AuthRoleServiceImpl extends Service implements AuthRoleService { .resources(authResources.size()) .build(); }).collect(Collectors.toList()); - PageInfo pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), collect, AuthRoleDTO.class); + PageInfo pageInfo = SalaryPageUtil.buildPage(param.getCurrent(), param.getPageSize(), AuthRoleDTO.class); + pageInfo.setList(list); pageInfo.setTotal(total); return pageInfo; } @@ -92,7 +93,7 @@ public class AuthRoleServiceImpl extends Service implements AuthRoleService { @Override public AuthRoleDTO getRole(Long id) { AuthRolePO po = getAuthRoleMapper().getById(id); - if (po == null){ + if (po == null) { throw new SalaryRunTimeException("业务线不存在"); } Long roleId = po.getId(); @@ -244,6 +245,6 @@ public class AuthRoleServiceImpl extends Service implements AuthRoleService { @Override public List listAll() { - return getAuthRoleMapper().listAll(); + return getAuthRoleMapper().listAll(); } }