From 4ad91ff7f11e67502e19be49915c6f93f736b355 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?= =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com> Date: Thu, 30 May 2024 20:14:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=8F=9C=E5=8D=95=E7=BF=BB=E8=AF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/core/apiservice/controller/base/AuthController.java | 3 +++ .../core/apiservice/controller/busi/SysMemTreeController.java | 10 +++++----- 2 files changed, 8 insertions(+), 5 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 302c7ae..4cff3bb 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 @@ -275,7 +275,10 @@ public class AuthController extends CoreBaseController { } else { List menuList = memTreeService.packTreeSysMenuByUserId(getSessionUser().getUser().getId()); list = memTreeService.packTreeSysMenuByParentIdAndMenuType(menuList, CommonConstWords.SYSTEM_MENU_ROOT_ID, CommonEnumUtil.METHOD_LEVEL.PLUGIN.getValue()); + + } + list = sysMenuService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(), list); if (list != null && list.size() > 0) { // 内存排序 Sort 降序 code 升序 diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java index 8154bf3..2e6e858 100644 --- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java +++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/busi/SysMemTreeController.java @@ -1,9 +1,6 @@ package cn.estsh.i3plus.core.apiservice.controller.busi; -import cn.estsh.i3plus.core.api.iservice.busi.ICoreMemTreeService; -import cn.estsh.i3plus.core.api.iservice.busi.IPersonnelService; -import cn.estsh.i3plus.core.api.iservice.busi.ISysOrganizeService; -import cn.estsh.i3plus.core.api.iservice.busi.ISysPositionService; +import cn.estsh.i3plus.core.api.iservice.busi.*; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ResourceEnumUtil; @@ -47,7 +44,8 @@ public class SysMemTreeController extends CoreBaseController { @Autowired private ISysOrganizeService organizeService; - + @Autowired + private ISysMenuService sysMenuService; /** * 根据父节点ID 获取树列表 * @return 处理结果 @@ -224,6 +222,8 @@ public class SysMemTreeController extends CoreBaseController { }else{ result = memTreeService.packTreeSysMenuByUserId(getSessionUser().getUser().getId()); } + result = sysMenuService.setLanguageSysMenuName(AuthUtil.getSessionUser().getLanguageCode(), result); + return ResultBean.success("操作成功").setResultList(result).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode()); }catch(ImppBusiException busExcep){ return ResultBean.fail(busExcep);