From 381802c10c7ec91a2b9c61fdbe4002519569f38f Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Thu, 1 Jun 2023 20:55:34 +0800
Subject: [PATCH] Fixed pagination in GroupManagement

---
 .../mapper/permission/GroupMapper.java        |  5 +--
 .../permission/impl/GroupServiceImpl.java     |  6 +++-
 .../mapper/permission/GroupMapper.xml         | 33 +++++++++++--------
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java
index fc1af2d..004668b 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/mapper/permission/GroupMapper.java
@@ -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);
 }
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
index 2276930..1df926c 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/GroupServiceImpl.java
@@ -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
diff --git a/Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml b/Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
index 6f2b5b1..acce8c4 100644
--- a/Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/permission/GroupMapper.xml
@@ -3,25 +3,30 @@
 <mapper namespace="com.cfive.pinnacle.mapper.permission.GroupMapper">
 
     <select id="getAll" resultMap="groupMap">
-        select t_group.id      as group_id,
-               t_group.name    as group_name,
-               t_group.enable  as group_enable,
-               t_group.deleted as group_deleted,
-               t_group.version as group_version,
-               tr.id           as role_id,
-               tr.name         as role_name,
-               tr.deleted      as role_deleted,
-               tr.version      as role_version
-        from t_group
-                 left join (select * from t_role_group where deleted = 0) as trg on t_group.id = trg.group_id
-                 left join (select * from t_role where deleted = 0) as tr on tr.id = trg.role_id
-        where t_group.deleted = 0
+        select distinct t_group.id as group_id,
+        t_group.name as group_name,
+        t_group.enable as group_enable,
+        t_group.deleted as group_deleted,
+        t_group.version as group_version,
+        tr.id as role_id,
+        tr.name as role_name,
+        tr.deleted as role_deleted,
+        tr.version as role_version
+        from (select * from t_group where deleted = 0) as t_group
+        left join (select * from t_role_group where deleted = 0) as trg on t_group.id = trg.group_id
+        left join (select * from t_role where deleted = 0) as tr on tr.id = trg.role_id
+        <where>
+            <foreach collection="groupList" item="item" index="index" open="t_group.id in (" separator="," close=")"
+                     nullable="true">
+                #{item.id}
+            </foreach>
+        </where>
     </select>
 
     <select id="getOneById" resultMap="groupMap">
         select t_group.id      as group_id,
                t_group.name    as group_name,
-               t_group.enable as group_enable,
+               t_group.enable  as group_enable,
                t_group.deleted as group_deleted,
                t_group.version as group_version,
                tr.id           as role_id,