From e1a394d9e3f69833eb3d148ebcbaf658cc624547 Mon Sep 17 00:00:00 2001
From: wynne1005 <lu_1005@foxmail.com>
Date: Wed, 14 Jul 2021 15:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=8F=9C=E5=8D=95menusort?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E6=8E=92=E5=A5=BD=E5=BA=8F=E7=9A=84=20?=
 =?UTF-8?q?=E7=BB=99=E5=88=B0=E5=89=8D=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../apiservice/controller/base/AuthController.java   | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
index e97ca6f..a38591a 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/AuthController.java
@@ -132,7 +132,7 @@ public class AuthController extends CoreBaseController {
         Long startTime = System.currentTimeMillis();
         List<SysMenu> menuList = memTreeService.packTreeSysMenuByUserId(getSessionUser().getUser().getId());
         Long menuSelectTime = System.currentTimeMillis();
-        LOGGER.info("第一段耗时：{}",menuSelectTime-startTime);
+        LOGGER.info("第一段耗时：{}", menuSelectTime - startTime);
         List<SysMenu> list = memTreeService.packTreeSysMenuByParentIdAndMenuType(menuList, CommonConstWords.SYSTEM_MENU_ROOT_ID, CommonEnumUtil.METHOD_LEVEL.PLUGIN.getValue());
         LOGGER.info("第二段耗时：{}", System.currentTimeMillis() - menuSelectTime);
 
@@ -157,10 +157,14 @@ public class AuthController extends CoreBaseController {
     @ApiOperation(value = "获取登录用户功能权限信息", notes = "获取首页权限信息")
     public ResultBean findMenuModuleList(@PathVariable("parentId") String parentId) {
         try {
-            ValidatorBean.checkIsNumber(parentId,"父节点不能为空");
+            ValidatorBean.checkIsNumber(parentId, "父节点不能为空");
 
             List<SysMenu> result = memTreeService.packTreeSysMenuByUserIdAndParentId(getSessionUser().getUser().getId(), Long.parseLong(parentId));
-            result=sysMenuService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(),result);
+            for (SysMenu sysMenu : result) {
+                sysMenu.setChildList(sysMenu.getChildList().stream().sorted(Comparator.comparing(SysMenu::getMenuSort)).collect(Collectors.toList()));
+            }
+            result = result.stream().sorted(Comparator.comparing(SysMenu::getMenuSort)).collect(Collectors.toList());
+            result = sysMenuService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(), result);
             return ResultBean.success("操作成功").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()).setResultList(result);
         } catch (ImppBusiException busExcep) {
             LOGGER.error(busExcep.getErrorMsg() + "：{}", busExcep.getErrorDetail(), busExcep);
@@ -182,11 +186,11 @@ public class AuthController extends CoreBaseController {
     @ApiOperation(value = "获取登录用户功能权限信息", notes = "获取首页权限信息")
     public ResultBean findModuleList(@PathVariable("parentId") String parentId) {
         try {
-            ValidatorBean.checkIsNumber(parentId,"父节点不能为空");
+            ValidatorBean.checkIsNumber(parentId, "父节点不能为空");
 
             List<SysMenu> result = memTreeService.packTreeSysMenuByUserIdAndParentId(getSessionUser().getUser().getId(), Long.parseLong(parentId));
             // 国际化
-            result = sysMenuService.setLanguageSysMenuName(getSessionUser().getLanguageCode(),result);
+            result = sysMenuService.setLanguageSysMenuName(getSessionUser().getLanguageCode(), result);
             result = findChildList(result);
 
             return ResultBean.success("操作成功")
@@ -203,11 +207,11 @@ public class AuthController extends CoreBaseController {
     }
 
 
-    private List<SysMenu> findChildList(List<SysMenu> findList){
+    private List<SysMenu> findChildList(List<SysMenu> findList) {
         List<SysMenu> result = new ArrayList<>();
-        if(CollectionUtils.isNotEmpty(findList)){
+        if (CollectionUtils.isNotEmpty(findList)) {
             for (SysMenu menu : findList) {
-                if(CollectionUtils.isNotEmpty(menu.getChildList())){
+                if (CollectionUtils.isNotEmpty(menu.getChildList())) {
                     result.addAll(findChildList(menu.getChildList()));
                 }
                 result.add(menu);