考勤，日历排班结果列表导出接口逻辑优化,部门、分部字段增加多语言格式表述解析

src/com/engine/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.java

@@ -85,8 +85,8 @@ public class ExcelExportImportServiceImpl extends Service implements ExcelExport
                 record = new HashMap<>();
                 record.put("workcode", Util.null2String(dataItem.get("workcode")));
                 record.put("lastname", Util.null2String(dataItem.get("lastname")));
-                record.put("subcompany", Util.null2String(dataItem.get("subcompany")));
-                record.put("department", Util.null2String(dataItem.get("department")));
+                record.put("subcompany", Util.formatMultiLang(Util.null2String(dataItem.get("subcompany")), "" + user.getLanguage()));
+                record.put("department", Util.formatMultiLang(Util.null2String(dataItem.get("department")), "" + user.getLanguage()));
                 for (Map.Entry<String, Object> entry : dataItem.entrySet()) {
                     if (DateUtil.dateIsValid(entry.getKey())) {
                         dayItem = (Map<String, Object>) entry.getValue();
@@ -306,10 +306,10 @@ public class ExcelExportImportServiceImpl extends Service implements ExcelExport
 
     private List<Map<String, Object>> matchImportEmp(List<Map<String, Object>> employeeByIds, String lastName, String subCompany, String department, String workCode) {
         employeeByIds = employeeByIds.stream().filter(e ->
-                (StrUtil.isBlank(workCode) || Objects.equals(e.get("workcode").toString(), workCode))
+                (StrUtil.isBlank(workCode) || Objects.equals(Util.null2String(e.get("workcode")), workCode))
                 && (StrUtil.isBlank(lastName) || Objects.equals(e.get("lastname").toString(), lastName))
-                && (StringUtils.isBlank(department) || Objects.equals(e.get("departmentname"), department))
-                && (StringUtils.isBlank(subCompany) || Objects.equals(e.get("subcompanyname"), subCompany)))
+                && (StringUtils.isBlank(department) || Objects.equals(Util.formatMultiLang(Util.null2String(e.get("departmentname")), "" + user.getLanguage()), department))
+                && (StringUtils.isBlank(subCompany) || Objects.equals(Util.formatMultiLang(Util.null2String(e.get("subcompanyname")), "" + user.getLanguage()), subCompany)))
                 .collect(Collectors.toList());
         return employeeByIds;
     }