菜单bug修改

src/main/java/com/neotel/smfcore/security/rest/MenuController.java

@@ -125,10 +125,19 @@ public class MenuController {
     @GetMapping
     @ApiOperation("查询菜单")
     @PreAuthorize("@el.check('menu:list')")
-    public PageData<MenuDto> query(MenuQueryCondition criteria) throws Exception {
+    public PageData<MenuDto> query(MenuQueryCondition criteria,HttpServletRequest servletRequest) throws Exception {
+        Locale locale=servletRequest.getLocale();
         Query query = QueryHelp.getQuery(criteria);
         query.addCriteria(Criteria.where("type").ne(2));
-        List<MenuDto> menuDtoList = menuMapper.toDto(menuManager.findByQuery(query));
+        List<Menu> menuList=menuManager.findByQuery(query);
+        for (int i=0;i<menuList.size();i++){
+            String oldName=ObjectUtil.isNotEmpty(menuList.get(i).getComponentName())?menuList.get(i).getComponentName():menuList.get(i).getTitle();
+            String titleKey=menuList.get(i).getTitleKey();
+            String title= MessageUtils.getText(menuList.get(i).GetMsgKey(), locale,oldName);
+            menuList.get(i).setTitle(title);
+        }
+        List<MenuDto> menuDtoList = menuMapper.toDto(menuList);
+
         return new PageData(menuDtoList, menuDtoList.size());
     }