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

多语言支持

This commit is contained in:
dxfeng 2024-06-19 13:46:20 +08:00
parent c6d82e66ff
commit 165cdfadd3
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/organization/service/impl/ExportCommonServiceImpl.java
View File

@ -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<WeaTableColumn> weaTableColumnList = new ArrayList<>();
List<String> fields = new ArrayList<>();
HrmResourceServiceImpl hrmResourceService = new HrmResourceServiceImpl();
HrmResourceServiceImpl hrmResourceService = ServiceUtil.getService(HrmResourceServiceImpl.class,user);
List<SearchConditionGroup> allConditions = hrmResourceService.getAllConditions();
List<String> columnList;

2
src/com/engine/organization/util/HrmI18nUtil.java
View File

@ -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;
}
//