From 165cdfadd399cd3c703fa853a57260cf959dd3de Mon Sep 17 00:00:00 2001 From: dxfeng Date: Wed, 19 Jun 2024 13:46:20 +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 --- .../organization/service/impl/ExportCommonServiceImpl.java | 3 ++- src/com/engine/organization/util/HrmI18nUtil.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java index 8486a5f2..4d5917dc 100644 --- a/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java +++ b/src/com/engine/organization/service/impl/ExportCommonServiceImpl.java @@ -8,6 +8,7 @@ import com.cloudstore.dev.api.service.Service_DevTable; import com.cloudstore.eccom.constant.WeaBoolAttr; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.cloudstore.eccom.result.WeaResultMsg; +import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; import com.engine.organization.component.OrganizationWeaTable; import com.engine.organization.entity.department.bo.DepartmentBO; @@ -121,7 +122,7 @@ public class ExportCommonServiceImpl extends Service implements ExportCommonServ table.setSqlwhere(sqlWhere); List weaTableColumnList = new ArrayList<>(); List fields = new ArrayList<>(); - HrmResourceServiceImpl hrmResourceService = new HrmResourceServiceImpl(); + HrmResourceServiceImpl hrmResourceService = ServiceUtil.getService(HrmResourceServiceImpl.class,user); List allConditions = hrmResourceService.getAllConditions(); List columnList; diff --git a/src/com/engine/organization/util/HrmI18nUtil.java b/src/com/engine/organization/util/HrmI18nUtil.java index fb47fcbc..49134ad0 100644 --- a/src/com/engine/organization/util/HrmI18nUtil.java +++ b/src/com/engine/organization/util/HrmI18nUtil.java @@ -26,7 +26,7 @@ public class HrmI18nUtil { if (labelId < 0) { return defaultLabel; } - String htmlLabelName = SystemEnv.getHtmlLabelName(labelId, labelId); + String htmlLabelName = SystemEnv.getHtmlLabelName(labelId, language); return StringUtils.isNotBlank(htmlLabelName) ? htmlLabelName : defaultLabel; } //