From 798c9642110b16b27cc2312ea29ca3fff47abacc Mon Sep 17 00:00:00 2001 From: nies Date: Wed, 17 Nov 2021 11:06:13 +0800 Subject: [PATCH] =?UTF-8?q?(update)find-module-list=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E6=A0=B9=E6=8D=AEmenuSort=E6=9D=A5=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=90=AF=E7=94=A8=E5=90=8E=E7=AB=AF=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/apiservice/controller/base/AuthController.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 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 a38591a..ffc4ad4 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 @@ -155,15 +155,18 @@ public class AuthController extends CoreBaseController { */ @GetMapping(value = "/menu/find-module-list/{parentId}") @ApiOperation(value = "获取登录用户功能权限信息", notes = "获取首页权限信息") - public ResultBean findMenuModuleList(@PathVariable("parentId") String parentId) { + public ResultBean findMenuModuleList(@PathVariable("parentId") String parentId, Integer menuSort) { try { ValidatorBean.checkIsNumber(parentId, "父节点不能为空"); List result = memTreeService.packTreeSysMenuByUserIdAndParentId(getSessionUser().getUser().getId(), Long.parseLong(parentId)); - for (SysMenu sysMenu : result) { - sysMenu.setChildList(sysMenu.getChildList().stream().sorted(Comparator.comparing(SysMenu::getMenuSort)).collect(Collectors.toList())); + //如果menuSort为0,则不用通过menuSort字段进行排序 + if (menuSort != 0) { + 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 = 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) {