From ab4fb5a914de5b187923d74af339242028a6f78a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=AD=E5=A6=82?= <8775@163.com>
Date: Thu, 6 Feb 2025 12:21:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=8D=95=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gitee/sop/admin/service/sys/SysResourceService.java   | 8 ++++++++
 .../sop/admin/controller/sys/SysResourceController.java   | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysResourceService.java b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysResourceService.java
index 9f17dc32..615f3afe 100755
--- a/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysResourceService.java
+++ b/sop-admin/sop-admin-backend/admin-service/src/main/java/com/gitee/sop/admin/service/sys/SysResourceService.java
@@ -5,6 +5,9 @@ import com.gitee.sop.admin.dao.entity.SysResource;
 import com.gitee.sop.admin.dao.mapper.SysResourceMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
+import java.util.List;
+
 
 /**
  * @author 六如
@@ -12,4 +15,9 @@ import org.springframework.stereotype.Service;
 @Service
 public class SysResourceService implements ServiceSupport<SysResource, SysResourceMapper> {
 
+    public List<SysResource> listAllResource() {
+        List<SysResource> list = this.listAll();
+        list.sort(Comparator.comparing(SysResource::getRank));
+        return list;
+    }
 }
diff --git a/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysResourceController.java b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysResourceController.java
index 1988d04c..f00fa124 100755
--- a/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysResourceController.java
+++ b/sop-admin/sop-admin-backend/admin-web/src/main/java/com/gitee/sop/admin/controller/sys/SysResourceController.java
@@ -55,7 +55,7 @@ public class SysResourceController {
      */
     @GetMapping("/listAll")
     public Result<List<SysResourceVO>> listAll() {
-        List<SysResource> list = sysResourceService.listAll();
+        List<SysResource> list = sysResourceService.listAllResource();
         List<SysResourceVO> retList = CopyUtil.copyList(list, SysResourceVO::new);
         return Result.ok(retList);
     }