ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/GameEventProjectServiceImpl.java

@@ -385,6 +385,7 @@ public class GameEventProjectServiceImpl implements IGameEventProjectService {
             Wrappers.lambdaQuery(GameEventProject.class)
                 .eq(GameEventProject::getEventId, eventId)
                 .select(GameEventProject::getProjectType, GameEventProject::getProjectName)
+                .orderByDesc(GameEventProject::getProjectType)
         );
 
         // 从字典中获取项目类型映射：projectType (dictValue) -> dictLabel

ruoyi-modules/ruoyi-game-event/src/main/java/org/dromara/system/service/impl/IEnrollServiceImpl.java

@@ -78,7 +78,7 @@ public class IEnrollServiceImpl implements IEnrollService {
                     // 当分类下的项目少于2个时不需要合并
                     Cell cell = row.createCell(currentColumnIndex);
                     cell.setCellValue(categoryName);
-                    int lastColumnIndex = 0;
+                    int lastColumnIndex = currentColumnIndex;
                     if (projectCount >= 2) {
                         // 3.2 合并单元格：从 currentColumnIndex 开始，合并 projectCount 个单元格
                         lastColumnIndex = currentColumnIndex + projectCount - 1;