From c2697e539059d427cb7c1f91318759dc303697d0 Mon Sep 17 00:00:00 2001
From: wangjinlei <751475802@qq.com>
Date: Fri, 12 Apr 2024 17:27:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8Fbug=20=E4=BF=AE=E5=A4=8D=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E5=B7=A6=E4=BE=A7=E6=A0=8F=E7=9B=AE=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sociology/service/impl/CourseServiceImpl.java       | 1 -
 .../com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
index b99078a2..3dcf430d 100644
--- a/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
+++ b/src/main/java/com/peanut/modules/sociology/service/impl/CourseServiceImpl.java
@@ -17,7 +17,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
diff --git a/src/main/java/com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java b/src/main/java/com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java
index 5216433b..0eabab68 100644
--- a/src/main/java/com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java
+++ b/src/main/java/com/peanut/modules/sys/service/impl/SysMenuServiceImpl.java
@@ -79,7 +79,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuDao, SysMenuEntity> i
 	private List<SysMenuEntity> getMenuList(List<Long> menuIdList) {
 		// 查询拥有的所有菜单
 		List<SysMenuEntity> menus = this.baseMapper.selectList(new QueryWrapper<SysMenuEntity>()
-				.in(Objects.nonNull(menuIdList), "menu_id", menuIdList).in("type", 0, 1));
+				.in(Objects.nonNull(menuIdList), "menu_id", menuIdList).in("type", 0, 1).orderByAsc("order_num"));
 		// 将id和菜单绑定
 		HashMap<Long, SysMenuEntity> menuMap = new HashMap<>(12);
 		for (SysMenuEntity s : menus) {