⚡ 优化. 定义常量菜单树根节点

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/CommonConstants.java

@@ -47,6 +47,11 @@ public interface CommonConstants {
 	 */
 	String MENU = "0";
 
+	/**
+	 * 菜单树根节点
+	 */
+	Integer MENU_TREE_ROOT_ID = -1;
+
 	/**
 	 * 编码
 	 */

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java

@@ -68,7 +68,7 @@ public class MenuController {
 				.map(MenuTree::new)
 				.sorted(Comparator.comparingInt(MenuTree::getSort))
 				.collect(Collectors.toList());
-		return new R<>(TreeUtil.build(menuTreeList, -1));
+		return new R<>(TreeUtil.build(menuTreeList, CommonConstants.MENU_TREE_ROOT_ID));
 	}
 
 	/**
@@ -78,7 +78,9 @@ public class MenuController {
 	 */
 	@GetMapping(value = "/tree")
 	public R getTree() {
-		return new R<>(TreeUtil.buildTree(sysMenuService.list(Wrappers.emptyWrapper()), -1));
+		return new R<>(TreeUtil.buildTree(sysMenuService
+				.list(Wrappers.<SysMenu>lambdaQuery()
+						.orderByAsc(SysMenu::getSort)), CommonConstants.MENU_TREE_ROOT_ID));
 	}
 
 	/**