From 444cb89e057680fa01f8f61acb3fe75c01ac1305 Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Mon, 5 Jun 2023 01:58:47 +0800
Subject: [PATCH] Added desc order by id to GroupManagement and RoleManagement

---
 .../service/permission/impl/GroupServiceImpl.java      |  7 ++++++-
 .../service/permission/impl/RoleServiceImpl.java       | 10 ++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

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 d7faea0..acfb989 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.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.cfive.pinnacle.entity.permission.Group;
@@ -14,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 
@@ -43,6 +45,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
     @Override
     public IPage<Group> getAllGroup(Long currentPage, Long pageSize, String searchName, List<Long> searchRole, Integer searchEnable, Integer searchRegex) {
         Page<Group> groupIPage = PageDTO.of(currentPage, pageSize);
+        groupIPage.addOrder(OrderItem.desc("id"));
         searchName = searchName.trim();
         List<Long> groupList = groupMapper.filterGroupByRoleId(null, null, searchName, searchEnable, searchRegex);
         if (groupList.size() > 0) {
@@ -57,7 +60,9 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         if (groupList.size() > 0) {
             LambdaQueryWrapper<Group> wrapper = new LambdaQueryWrapper<Group>().in(Group::getId, groupList);
             groupIPage = groupMapper.selectPage(groupIPage, wrapper);
-            groupIPage.setRecords(groupMapper.getAll(groupIPage.getRecords()));
+            List<Group> groups = groupMapper.getAll(groupIPage.getRecords());
+            Collections.reverse(groups);
+            groupIPage.setRecords(groups);
         }
 
 
diff --git a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java
index bdc9cdf..164a7b2 100644
--- a/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java
+++ b/Pinnacle/src/main/java/com/cfive/pinnacle/service/permission/impl/RoleServiceImpl.java
@@ -2,6 +2,8 @@ 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.metadata.OrderItem;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.PageDTO;
 import com.cfive.pinnacle.entity.permission.*;
 import com.cfive.pinnacle.exception.DataValidationFailedException;
@@ -13,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -43,7 +46,8 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
 
     @Override
     public IPage<Role> getAllRole(Long currentPage, Long pageSize, String searchName, List<Long> searchPower, Integer searchEnable, Integer searchRegex) {
-        IPage<Role> roleIPage = PageDTO.of(currentPage, pageSize);
+        Page<Role> roleIPage = PageDTO.of(currentPage, pageSize);
+        roleIPage.addOrder(OrderItem.desc("id"));
         searchName = searchName.trim();
         List<Long> roleList = roleMapper.filterRoleByPowerId(null, null, searchName, searchEnable, searchRegex);
         if (roleList.size() > 0) {
@@ -58,7 +62,9 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
         if (roleList.size() > 0) {
             LambdaQueryWrapper<Role> wrapper = new LambdaQueryWrapper<Role>().in(Role::getId, roleList);
             roleIPage = roleMapper.selectPage(roleIPage, wrapper);
-            roleIPage.setRecords(roleMapper.getAll(roleIPage.getRecords()));
+            List<Role> roles = roleMapper.getAll(roleIPage.getRecords());
+            Collections.reverse(roles);
+            roleIPage.setRecords(roles);
         }
 
         return roleIPage;