diff --git a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicRoleMenuRelationMapperExt.xml b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicRoleMenuRelationMapperExt.xml
index 086d184..1b2b268 100644
--- a/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicRoleMenuRelationMapperExt.xml
+++ b/dongjian-dashboard-back-dao/src/main/resources/mappers/ex/BasicRoleMenuRelationMapperExt.xml
@@ -34,7 +34,17 @@
SELECT
bmenu.`id` AS `menuId`,
bmenu.parent_menu_id AS parentMenuId,
- bmenu.menu_name AS title,
+
+
+ bmenu.menu_name AS title,
+
+
+ bmenu.menu_name_en AS title,
+
+
+ bmenu.menu_name_jp AS title,
+
+
bmenu.dashboard_lowest_node AS dashboardLowestNode
FROM
basic_menu bmenu
diff --git a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/RoleServiceImpl.java b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/RoleServiceImpl.java
index 1099aa9..7d16fc0 100644
--- a/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/RoleServiceImpl.java
+++ b/dongjian-dashboard-back-service/src/main/java/com/dongjian/dashboard/back/service/impl/RoleServiceImpl.java
@@ -333,8 +333,10 @@ public class RoleServiceImpl implements RoleService {
));
}
+ Map paramMap = new HashMap<>();
+ paramMap.put("languageType", languageType);
// 查询全量菜单
- List allMenus = basicRoleMenuRelationMapperExt.selectAllMenu(Collections.emptyMap());
+ List allMenus = basicRoleMenuRelationMapperExt.selectAllMenu(paramMap);
Map fullMenuMap = allMenus.stream()
.collect(Collectors.toMap(DashboardTreeMenusDTO::getMenuId, m -> m));
@@ -345,7 +347,6 @@ public class RoleServiceImpl implements RoleService {
visibleMenus = new ArrayList<>(allMenus);
} else {
Long roleId = basicRoleMenuRelationMapperExt.getRoleIdByUserId(userId);
- Map paramMap = new HashMap<>();
paramMap.put("superRole", superRole);
paramMap.put("roleId", roleId);
visibleMenus = basicRoleMenuRelationMapperExt.selectAllMenu(paramMap);