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 i private List getMenuList(List menuIdList) { // 查询拥有的所有菜单 List menus = this.baseMapper.selectList(new QueryWrapper() - .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 menuMap = new HashMap<>(12); for (SysMenuEntity s : menus) {