pc端菜单添加 数据分析菜单 菜单查询改为内连接

epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java

@@ -107,7 +107,11 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
 
         //保存菜单
         insert(entity);
-        saveLanguage(entity.getId(), "name", entity.getName());
+        String tableName = dto.getTableName();
+        if (StringUtils.isBlank(tableName)){
+            tableName = "gov_menu";
+        }
+        saveLanguage(tableName, entity.getId(), "name", entity.getName());
 
         //保存菜单资源
         govResourceService.saveMenuResource(entity.getId(), entity.getName(), dto.getResourceList());
@@ -126,10 +130,14 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
         if(entity.getId().equals(entity.getPid())){
             throw new RenException(ErrorCode.SUPERIOR_MENU_ERROR);
         }
+        String tableName = dto.getTableName();
+        if (StringUtils.isBlank(tableName)){
+            tableName = "gov_menu";
+        }
 
         //更新菜单
         updateById(entity);
-        saveLanguage(entity.getId(), "name", entity.getName());
+        saveLanguage(tableName, entity.getId(), "name", entity.getName());
 
         //更新菜单资源
         govResourceService.saveMenuResource(entity.getId(), entity.getName(), dto.getResourceList());
@@ -276,7 +284,7 @@ public class GovMenuServiceImpl extends BaseServiceImpl<GovMenuDao, GovMenuEntit
         logger.info(String.format("运营端用户退出系统%s,清空菜单、权限成功",userId));
     }
 
-    private void saveLanguage(String tableId, String fieldName, String fieldValue){
+    private void saveLanguage(String tableName, String tableId, String fieldName, String fieldValue){
-        govLanguageService.saveOrUpdate("gov_menu", tableId, fieldName, fieldValue, HttpContextUtils.getLanguage());
+        govLanguageService.saveOrUpdate(tableName, tableId, fieldName, fieldValue, HttpContextUtils.getLanguage());
     }
 }