liang.cheng
/
weaver-hrm-organization
2
2
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '多语言支持' (#255) from feature/dxf into develop

Browse Source 
Reviewed-on: #255
pull/258/head
dxfeng 10 months ago
parent f0980d5bbd 0c068a81f0
commit d2603be072
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File

2
src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java
Unescape Escape View File

@ -59,7 +59,7 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel
userInfo = getPersonnelCardMapper().getUserById(uId); userInfo = getPersonnelCardMapper().getUserById(uId);
userInfo.setEcId(uId.toString()); userInfo.setEcId(uId.toString());
OrganizationAssert.notNull(uId, "未找到对应数据"); OrganizationAssert.notNull(uId, SystemEnv.getHtmlLabelName(547440, user.getLanguage()));
// 人员基本信息 // 人员基本信息
// 统计报表 // 统计报表

17
src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java
Unescape Escape View File

@ -125,18 +125,19 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
resultMap.put("hasRight", true); resultMap.put("hasRight", true);
ArrayList<MenuBtn> topMenuList = new ArrayList<>(); ArrayList<MenuBtn> topMenuList = new ArrayList<>();
ArrayList<MenuBtn> rightMenuList = new ArrayList<>(); ArrayList<MenuBtn> 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("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("导出当前").type("BTN_CurrentExport").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("全部导出（合并）").type("BTN_MergeExport").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,user.getLanguage())).type("BTN_AllExport").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); 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("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("导出当前").type("BTN_CurrentExport").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("全部导出（合并）").type("BTN_MergeExport").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,user.getLanguage())).type("BTN_AllExport").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); resultMap.put("rightMenu", rightMenuList);
return resultMap; return resultMap;

Write Preview
Loading…
Cancel
Save