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 GroupManagement

Browse Source
This commit is contained in:
Fat Snake
2023-06-01 20:55:34 +08:00
parent e58dd032c8
commit 381802c10c
3 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.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.Group;
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 GroupMapper extends BaseMapper<Group> {
IPage<Group> getAll(IPage<Group> groupIPage);
List<Group> getAll(@Param("groupList") List<Group> groupList);
Group getOneById(@Param("id") long id);
}

6
Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
View File

@@ -2,6 +2,7 @@ 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.Page;
import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
import com.cfive.pinnacle.entity.permission.Group;
@@ -42,7 +43,10 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
@Override
public IPage<Group> getAllGroup(Long currentPage, Long pageSize) {
Page<Group> groupIPage = PageDTO.of(currentPage, pageSize);
return groupMapper.getAll(groupIPage);
groupIPage = groupMapper.selectPage(groupIPage, Wrappers.emptyWrapper());
groupIPage.setRecords(groupMapper.getAll(groupIPage.getRecords()));
return groupIPage;
}
@Override