From 861d7cba463afda818d4ac46eeb30777d4dbeeb4 Mon Sep 17 00:00:00 2001
From: OpenCode <opencode@vben.dev>
Date: Sun, 26 Jul 2026 23:07:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=BB=84=E7=BB=87=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E6=94=AF=E6=8C=81=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- AppOrgModuleEntity新增sortOrder字段
- authorizeModules按moduleKeys数组索引设置sortOrder
- getModuleKeysByOrgId按sortOrder升序查询
---
 .../java/com/cool/modules/org/entity/AppOrgModuleEntity.java  | 3 +++
 .../modules/org/service/impl/AppOrgModuleServiceImpl.java     | 3 ++-
 .../com/cool/modules/org/service/impl/AppOrgServiceImpl.java  | 4 +++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/cool/modules/org/entity/AppOrgModuleEntity.java b/src/main/java/com/cool/modules/org/entity/AppOrgModuleEntity.java
index ce89f25..ff69cdb 100644
--- a/src/main/java/com/cool/modules/org/entity/AppOrgModuleEntity.java
+++ b/src/main/java/com/cool/modules/org/entity/AppOrgModuleEntity.java
@@ -24,6 +24,9 @@ public class AppOrgModuleEntity extends BaseEntity<AppOrgModuleEntity> {
     @ColumnDefine(comment = "组织级模块配置", type = "text")
     private String config;
 
+    @ColumnDefine(comment = "排序号", type = "int", defaultValue = "0")
+    private Integer sortOrder;
+
     @ColumnDefine(comment = "状态 0:禁用 1:启用", defaultValue = "1")
     private Integer status;
 }
diff --git a/src/main/java/com/cool/modules/org/service/impl/AppOrgModuleServiceImpl.java b/src/main/java/com/cool/modules/org/service/impl/AppOrgModuleServiceImpl.java
index 72cbcef..c78a1f2 100644
--- a/src/main/java/com/cool/modules/org/service/impl/AppOrgModuleServiceImpl.java
+++ b/src/main/java/com/cool/modules/org/service/impl/AppOrgModuleServiceImpl.java
@@ -18,7 +18,8 @@ public class AppOrgModuleServiceImpl extends BaseServiceImpl<AppOrgModuleMapper,
     public List<String> getModuleKeysByOrgId(Long orgId) {
         List<AppOrgModuleEntity> modules = list(QueryWrapper.create()
             .eq(AppOrgModuleEntity::getOrgId, orgId)
-            .eq(AppOrgModuleEntity::getStatus, 1));
+            .eq(AppOrgModuleEntity::getStatus, 1)
+            .orderBy(AppOrgModuleEntity::getSortOrder, true));
         return modules.stream()
             .map(AppOrgModuleEntity::getModuleKey)
             .collect(Collectors.toList());
diff --git a/src/main/java/com/cool/modules/org/service/impl/AppOrgServiceImpl.java b/src/main/java/com/cool/modules/org/service/impl/AppOrgServiceImpl.java
index ef2ec04..75c69a2 100644
--- a/src/main/java/com/cool/modules/org/service/impl/AppOrgServiceImpl.java
+++ b/src/main/java/com/cool/modules/org/service/impl/AppOrgServiceImpl.java
@@ -110,7 +110,8 @@ public class AppOrgServiceImpl extends BaseServiceImpl<AppOrgMapper, AppOrgEntit
             .eq(AppOrgModuleEntity::getOrgId, orgId);
         appOrgModuleService.remove(qw);
 
-        for (String moduleKey : moduleKeys) {
+        for (int i = 0; i < moduleKeys.size(); i++) {
+            String moduleKey = moduleKeys.get(i);
             AppModuleEntity module = appModuleMapper.selectOneByQuery(
                 QueryWrapper.create().eq(AppModuleEntity::getModuleKey, moduleKey)
             );
@@ -119,6 +120,7 @@ public class AppOrgServiceImpl extends BaseServiceImpl<AppOrgMapper, AppOrgEntit
             AppOrgModuleEntity orgModule = new AppOrgModuleEntity();
             orgModule.setOrgId(orgId);
             orgModule.setModuleKey(moduleKey);
+            orgModule.setSortOrder(i);
             orgModule.setStatus(1);
             appOrgModuleService.add(orgModule);
         }