From 0c068a81f0eb3c370689f110feef59339df81849 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 14 Jun 2024 10:43:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/HrmPersonnelCardServiceImpl.java | 2 +- .../impl/PersonnelResumeServiceImpl.java | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java index bb319272..c7aec95d 100644 --- a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java @@ -59,7 +59,7 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel userInfo = getPersonnelCardMapper().getUserById(uId); userInfo.setEcId(uId.toString()); - OrganizationAssert.notNull(uId, "未找到对应数据"); + OrganizationAssert.notNull(uId, SystemEnv.getHtmlLabelName(547440, user.getLanguage())); // 人员基本信息 // 统计报表 diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index 460a1c12..f47b0286 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -125,18 +125,19 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu resultMap.put("hasRight", true); ArrayList topMenuList = new ArrayList<>(); ArrayList rightMenuList = new ArrayList<>(); + int language = user.getLanguage(); // 新增 - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build()); - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build()); - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build()); - topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName(SystemEnv.getHtmlLabelName(547187,user.getLanguage())).type("BTN_AllExport").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("screening").menuIcon("icon-coms-man").menuName(SystemEnv.getHtmlLabelName(547254,language)).type("BTN_Screening").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("currentExport").menuIcon("icon-coms-export").menuName(SystemEnv.getHtmlLabelName(547255,language)).type("BTN_CurrentExport").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName(SystemEnv.getHtmlLabelName(547256,language)).type("BTN_MergeExport").build()); + topMenuList.add(MenuBtn.builder().isBatch("0").isTop("1").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName(SystemEnv.getHtmlLabelName(547187, language)).type("BTN_AllExport").build()); resultMap.put("topMenu", topMenuList); // 新增 - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("screening").menuIcon("icon-coms-man").menuName("人员筛选").type("BTN_Screening").build()); - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("currentExport").menuIcon("icon-coms-export").menuName("导出当前").type("BTN_CurrentExport").build()); - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName("全部导出（合并）").type("BTN_MergeExport").build()); - rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName(SystemEnv.getHtmlLabelName(547187,user.getLanguage())).type("BTN_AllExport").build()); + rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("screening").menuIcon("icon-coms-man").menuName(SystemEnv.getHtmlLabelName(547254,language)).type("BTN_Screening").build()); + rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("currentExport").menuIcon("icon-coms-export").menuName(SystemEnv.getHtmlLabelName(547255,language)).type("BTN_CurrentExport").build()); + rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("mergeExport").menuIcon("icon-coms02-coms2-Batch-export").menuName(SystemEnv.getHtmlLabelName(547256,language)).type("BTN_MergeExport").build()); + rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("allExport").menuIcon("icon-coms02-coms2-export").menuName(SystemEnv.getHtmlLabelName(547187, language)).type("BTN_AllExport").build()); resultMap.put("rightMenu", rightMenuList); return resultMap;