FatttSnake/Pinnacle-OA
1
0
Fork 0
mirror of https://github.com/FatttSnake/Pinnacle-OA.git synced 2026-04-06 07:21:24 +08:00
Code Packages Releases Activity

Fixed pagination in RoleManagement

Browse Source
This commit is contained in:
Fat Snake
2023-06-01 18:42:27 +08:00
parent 0a3d256ecf
commit e58dd032c8
3 changed files with 45 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/RoleMapper.java
View File

@@ -1,11 +1,12 @@
package com.cfive.pinnacle.mapper.permission;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.cfive.pinnacle.entity.permission.Role;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* <p>
* 角色 Mapper 接口
@@ -16,7 +17,7 @@ import org.apache.ibatis.annotations.Param;
*/
@Mapper
public interface RoleMapper extends BaseMapper<Role> {
IPage<Role> getAll(IPage<Role> roleIPage);
List<Role> getAll(@Param("roleList") List<Role> roleList);
Role getOneById(@Param("id") long id);
}

10
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java
View File

@@ -2,10 +2,9 @@ package com.cfive.pinnacle.service.permission.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.cfive.pinnacle.entity.permission.Power;
import com.cfive.pinnacle.entity.permission.Role;
import com.cfive.pinnacle.entity.permission.PowerRole;
import com.cfive.pinnacle.entity.permission.*;
import com.cfive.pinnacle.exception.DataValidationFailedException;
import com.cfive.pinnacle.mapper.permission.RoleMapper;
import com.cfive.pinnacle.mapper.permission.PowerRoleMapper;
@@ -46,7 +45,10 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
@Override
public IPage<Role> getAllRole(Long currentPage, Long pageSize) {
IPage<Role> roleIPage = PageDTO.of(currentPage, pageSize);
return roleMapper.getAll(roleIPage);
roleIPage = roleMapper.selectPage(roleIPage, Wrappers.emptyWrapper());
roleIPage.setRecords(roleMapper.getAll(roleIPage.getRecords()));
return roleIPage;
}
@Override