diff --git a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java index c6aa48d4..570b621c 100644 --- a/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java +++ b/src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java @@ -583,7 +583,7 @@ public class ExtendInfoBO { } if (Util.null2String(extendInfoPO.getFieldNameDesc()).length() > 0) { - searchConditionItem.setLabel(extendInfoPO.getFieldNameDesc()); + searchConditionItem.setLabel(Util.formatMultiLang(extendInfoPO.getFieldNameDesc())); } } diff --git a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java index 41fdf7c6..b8b04b4d 100644 --- a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java @@ -297,7 +297,7 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel List accessRoleIds = new ArrayList<>(Arrays.asList(Util.null2String(cardButton.getRoles()).split(","))); roleIds.retainAll(accessRoleIds); if (isAdmin || (isMySelf && "0".equals(cardButton.getSysDefault())) || CollectionUtils.isNotEmpty(roleIds)) { - buttonList.add(CardButtonPO.builder().name(cardButton.getName()).url(cardButton.getUrl()).sysDefault(cardButton.getSysDefault()).build()); + buttonList.add(CardButtonPO.builder().name(Util.formatMultiLang(cardButton.getName())).url(cardButton.getUrl()).sysDefault(cardButton.getSysDefault()).build()); } } return buttonList; diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java index 9a984d87..728249d2 100644 --- a/src/com/engine/organization/service/impl/JobServiceImpl.java +++ b/src/com/engine/organization/service/impl/JobServiceImpl.java @@ -289,7 +289,7 @@ public class JobServiceImpl extends Service implements JobService { } } - addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items)); + addGroups.add(new SearchConditionGroup(Util.formatMultiLang(extendTitle.getTitle()), true, items)); } } } @@ -319,7 +319,7 @@ public class JobServiceImpl extends Service implements JobService { for (ExtendTitlePO extendTitle : extendTitles) { List items = getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_JOB : JCL_ORG_JOBEXT, viewAttr, id, extendTitle.getId().toString(), "ec_jobTitle", "ec_department", "ec_company"); if (CollectionUtils.isNotEmpty(items)) { - addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items)); + addGroups.add(new SearchConditionGroup(Util.formatMultiLang(extendTitle.getTitle()), true, items)); } } }