多语言支持

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<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;

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