Parcourir la source

:zap: 顶部菜单增加排序功能

smallchill il y a 6 ans
Parent
commit
e27ce23af3

+ 2 - 1
src/main/java/org/springblade/modules/system/controller/MenuController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.modules.system.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
@@ -274,7 +275,7 @@ public class MenuController extends BladeController {
 		if (Func.isEmpty(user)) {
 			return null;
 		}
-		List<TopMenu> list = topMenuService.list();
+		List<TopMenu> list = topMenuService.list(Wrappers.<TopMenu>query().lambda().orderByAsc(TopMenu::getSort));
 		return R.data(list);
 	}
 

+ 1 - 1
src/main/java/org/springblade/modules/system/controller/TopMenuController.java

@@ -72,7 +72,7 @@ public class TopMenuController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入topMenu")
 	public R<IPage<TopMenu>> list(TopMenu topMenu, Query query) {
-		IPage<TopMenu> pages = topMenuService.page(Condition.getPage(query), Condition.getQueryWrapper(topMenu));
+		IPage<TopMenu> pages = topMenuService.page(Condition.getPage(query), Condition.getQueryWrapper(topMenu).lambda().orderByAsc(TopMenu::getSort));
 		return R.data(pages);
 	}