From 56b4135f57057d8119a40d537ec80a868df79129 Mon Sep 17 00:00:00 2001 From: smallchill Date: Fri, 5 Jun 2020 23:20:04 +0800 Subject: [PATCH] =?UTF-8?q?:zap:=20=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/springblade/system/controller/MenuController.java | 3 ++- .../org/springblade/system/controller/TopMenuController.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java index 2028727b..9b30ea0c 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/MenuController.java @@ -16,6 +16,7 @@ */ package org.springblade.system.controller; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport; import io.swagger.annotations.*; import lombok.AllArgsConstructor; @@ -263,7 +264,7 @@ public class MenuController extends BladeController { if (Func.isEmpty(user)) { return null; } - List list = topMenuService.list(); + List list = topMenuService.list(Wrappers.query().lambda().orderByAsc(TopMenu::getSort)); return R.data(list); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TopMenuController.java b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TopMenuController.java index bd2c5147..6d780a8f 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/controller/TopMenuController.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/controller/TopMenuController.java @@ -71,7 +71,7 @@ public class TopMenuController extends BladeController { @ApiOperationSupport(order = 2) @ApiOperation(value = "分页", notes = "传入topMenu") public R> list(TopMenu topMenu, Query query) { - IPage pages = topMenuService.page(Condition.getPage(query), Condition.getQueryWrapper(topMenu)); + IPage pages = topMenuService.page(Condition.getPage(query), Condition.getQueryWrapper(topMenu).lambda().orderByAsc(TopMenu::getSort)); return R.data(pages); }