From c84836d490f76120a38324ce11e6c86d03066b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Tue, 6 Sep 2022 17:12:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=83=E8=96=AA=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E8=B5=B7=E5=A7=8B=E7=BC=B4=E7=BA=B3=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E6=B6=88=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/service/impl/SalaryArchiveServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index 7c010c910..189ac5f3c 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -908,8 +908,8 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe String deparmentName = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(86185, "部门"))).orElse("").toString(); String mobile = Optional.ofNullable(map.get(SalaryI18nUtil.getI18nLabel(86186, "手机号"))).orElse("").toString(); List emps = importHandleParam.getEmployees().stream().filter(e -> (StringUtils.isBlank(userName) || Objects.equals(e.getUsername(), userName)) - && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName)) - && (StringUtils.isBlank(mobile) || Objects.equals(e.getMobile(), mobile))) + && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName)) + && (StringUtils.isBlank(mobile) || Objects.equals(e.getMobile(), mobile))) .collect(Collectors.toList()); List employeeSameIds = new ArrayList<>(); if (CollectionUtils.isNotEmpty(emps) && emps.size() > 1) { @@ -1044,14 +1044,14 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe errorMessageMap.put("message", rowindex + "发薪起始日期格式不正确，正确格式示例为'2022-01-01'、'2022/1/1'"); excelComments.add(errorMessageMap); isError = true; - }else if (!isEmpty && payEndDateI18n.equals(key) && !payEndDateCellVal.equals("") && !SalaryDateUtil.checkDay(payEndDateCellVal)) { + } else if (!isEmpty && payEndDateI18n.equals(key) && !payEndDateCellVal.equals("") && !SalaryDateUtil.checkDay(payEndDateCellVal)) { // 最后发薪日期 Map errorMessageMap = Maps.newHashMap(); errorMessageMap.put("message", rowindex + "最后发薪日期格式不正确，正确格式示例为'2022-01-01'、'2022/1/1'"); excelComments.add(errorMessageMap); isError = true; // 5.薪资项目列处理(初始化导入或调薪) - }else if (!isEmpty && effectiveTimeI18n.equals(key) && effectiveTime == null) { + } else if (!isEmpty && effectiveTimeI18n.equals(key) && effectiveTime == null) { // 3.生效时间处理 Map errorMessageMap = Maps.newHashMap(); errorMessageMap.put("message", rowindex + "生效日期错误或格式不正确，正确格式示例为'2022-01-01'、'2022/1/1'"); @@ -1530,7 +1530,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe } // 修改薪资档案 - if (CollectionUtils.isNotEmpty(salaryArchiveUpdates)) { + if (isInit && CollectionUtils.isNotEmpty(salaryArchiveUpdates)) { salaryArchiveUpdates.forEach(getSalaryArchiveMapper()::update); }