From b2904e1aad283a3219390461e8b097c7d5d0faaf Mon Sep 17 00:00:00 2001 From: sy Date: Wed, 12 Jun 2024 09:40:24 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=83=E5=8B=A4=EF=BC=8C=E6=97=A5=E5=8E=86?= =?UTF-8?q?=E6=8E=92=E7=8F=AD=E7=BB=93=E6=9E=9C=E5=88=97=E8=A1=A8=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?,=E9=83=A8=E9=97=A8=E3=80=81=E5=88=86=E9=83=A8=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=A2=9E=E5=8A=A0=E5=A4=9A=E8=AF=AD=E8=A8=80=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E8=A1=A8=E8=BF=B0=E8=A7=A3=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExcelExportImportServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/engine/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.java b/src/com/engine/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.java index 6e56baf..8f6172a 100644 --- a/src/com/engine/attendance/component/ImportAndExport/service/impl/ExcelExportImportServiceImpl.java +++ b/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 entry : dataItem.entrySet()) { if (DateUtil.dateIsValid(entry.getKey())) { dayItem = (Map) entry.getValue(); @@ -306,10 +306,10 @@ public class ExcelExportImportServiceImpl extends Service implements ExcelExport private List> matchImportEmp(List> 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; }