From 7daa2565844a5baf502d3eaa0b6064878ebe29a8 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 16 Sep 2022 11:41:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=E5=AF=BC=E5=85=A5=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=E7=9A=84sql=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/mapper/siaccount/InsuranceAccountDetailMapper.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 7ab5974fa..581080621 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -772,6 +772,7 @@ other_per_json = #{otherPerJson}, other_per_sum = #{otherPerSum}, per_sum = #{perSum}, + com_sum = #{comSum}, social_com_json = #{socialComJson}, social_com_sum = #{socialComSum}, fund_com_json = #{fundComJson}, From 478b9a3d165c0c6f519a7c82869b82ca0f7e569f Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 16 Sep 2022 13:23:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=96=B9=E5=BC=8F=E9=85=8D=E7=BD=AE-?= =?UTF-8?q?=E8=96=AA=E8=B5=84=E6=A0=B8=E7=AE=97-=E5=AF=BC=E5=85=A5,?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=BC=E5=85=A5=E4=BA=BA=E5=91=98=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E9=85=8D=E7=BD=AE=E5=8C=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SalaryAcctExcelServiceImpl.java | 26 +++++++++++++------ 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index b46a7f8cf..68cba7639 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -1,5 +1,6 @@ package com.engine.salary.service.impl; +import com.api.formmode.mybatis.util.SqlProxyHandle; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; @@ -27,7 +28,9 @@ import com.engine.salary.entity.taxagent.po.TaxAgentPO; import com.engine.salary.enums.SalaryValueTypeEnum; import com.engine.salary.enums.UserStatusEnum; import com.engine.salary.exception.SalaryRunTimeException; +import com.engine.salary.mapper.sys.SalarySysConfMapper; import com.engine.salary.service.*; +import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.util.SalaryEntityUtil; import com.engine.salary.util.SalaryI18nUtil; import com.engine.salary.util.excel.ExcelParseHelper; @@ -118,6 +121,10 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc return ServiceUtil.getService(SalaryAcctReportServiceImpl.class, user); } + private SalarySysConfMapper getSalarySysConfMapper() { + return SqlProxyHandle.getProxy(SalarySysConfMapper.class); + } + @Override public XSSFWorkbook exportSalaryAcctEmployee(SalaryAcctEmployeeQueryParam queryParam) { ValidUtil.doValidator(queryParam); @@ -521,6 +528,9 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc Long currentEmployeeId = (long) user.getUID(); + //查询对于人员信息导入筛选的全局配置 + SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode"); + // 薪资核算记录的id Long salaryAcctRecordId = param.getSalaryAcctRecordId(); // 薪资核算记录 @@ -612,25 +622,25 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc continue; } String dataValue = (String) map.getOrDefault(dataKey.toString(), ""); - String deparmentName = (String) map.getOrDefault("部门", ""); - String mobile = (String) map.getOrDefault("手机号", ""); + String workcode = (String) map.getOrDefault("工号", ""); if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) { usernameIndex = j; - if (StringUtils.isEmpty(dataValue)) { + if (StringUtils.isEmpty(dataValue) && "0".equals(salarySysConfPO.getConfValue())) { isError = true; Map errorMessageMap = Maps.newHashMap(); errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空")); excelComments.add(errorMessageMap); //salaryBatchService.createExcelComment(excelComments, SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空"), i, i, j, j); } else { - - List employeeSameIds = salaryEmployees.stream().filter(e -> (StringUtils.isBlank(dataValue) || Objects.equals(e.getUsername(), dataValue)) - && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName)) - && (StringUtils.isBlank(mobile) || Objects.equals(e.getMobile(), mobile))) - .collect(Collectors.toList()); + //筛选导入人员信息可以在人力资源池中匹配到的人员信息 + List employeeSameIds = getSalaryAcctEmployeeService(user).matchImportEmployee(salaryEmployees, dataValue, deparmentName, mobile, workcode); +// List employeeSameIds = salaryEmployees.stream().filter(e -> (StringUtils.isBlank(dataValue) || Objects.equals(e.getUsername(), dataValue)) +// && (StringUtils.isBlank(deparmentName) || Objects.equals(e.getDepartmentName(), deparmentName)) +// && (StringUtils.isBlank(mobile) || Objects.equals(e.getMobile(), mobile))) +// .collect(Collectors.toList()); if (CollectionUtils.isEmpty(employeeSameIds)) { isError = true; From 4d9b7af975965c008684d4a8cb2d4e94c0a31fa6 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 16 Sep 2022 14:21:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E7=A6=8F=E5=88=A9=E5=8F=B0=E8=B4=A6=E5=AF=BC=E5=85=A5=E9=A1=B9?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=A4=BE=E4=BF=9D=E5=90=88=E8=AE=A1=E3=80=81?= =?UTF-8?q?=E5=85=AC=E7=A7=AF=E9=87=91=E5=90=88=E8=AE=A1=E3=80=81=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E7=A6=8F=E5=88=A9=E5=90=88=E8=AE=A1=E3=80=81=E5=90=88?= =?UTF-8?q?=E8=AE=A1=E5=9B=9B=E4=B8=AA=E5=AD=97=E6=AE=B5=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E9=80=89=E6=8B=A9=EF=BC=8C=E5=B9=B6=E5=A2=9E=E5=8A=A0=E8=BF=99?= =?UTF-8?q?=E5=9B=9B=E4=B8=AA=E5=AD=97=E6=AE=B5=E7=9A=84=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../siaccount/InsuranceAccountDetailMapper.xml | 4 ++++ .../salary/service/impl/SIAccountServiceImpl.java | 13 +++++++++++++ .../engine/salary/wrapper/SalaryFormulaWrapper.java | 6 ++++++ 3 files changed, 23 insertions(+) diff --git a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml index 581080621..e41efcd8d 100644 --- a/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml +++ b/src/com/engine/salary/mapper/siaccount/InsuranceAccountDetailMapper.xml @@ -779,6 +779,10 @@ fund_com_sum = #{fundComSum}, other_com_json = #{otherComJson}, other_com_sum = #{otherComSum}, + social_sum = #{socialSum}, + fund_sum = #{fundSum}, + other_sum = #{otherSum}, + total = #{total}, update_time = #{updateTime}, diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 92da8c80f..19696a5d1 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -1386,6 +1386,19 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { insuranceAccountDetailPO.setBillMonth(baseMap.get("账单月份").toString()); } + if (!StringUtils.isEmpty(baseMap.getOrDefault("社保合计", "").toString())) { + insuranceAccountDetailPO.setSocialSum(baseMap.get("社保合计").toString()); + } + if (!StringUtils.isEmpty(baseMap.getOrDefault("公积金合计", "").toString())) { + insuranceAccountDetailPO.setFundSum(baseMap.get("公积金合计").toString()); + } + if (!StringUtils.isEmpty(baseMap.getOrDefault("其他福利合计", "").toString())) { + insuranceAccountDetailPO.setOtherSum(baseMap.get("其他福利合计").toString()); + } + if (!StringUtils.isEmpty(baseMap.getOrDefault("合计", "").toString())) { + insuranceAccountDetailPO.setTotal(baseMap.get("合计").toString()); + } + insuranceAccountDetailPO.setUpdateTime(new Date()); return insuranceAccountDetailPO; diff --git a/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java b/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java index ddd692fad..5e66d5c9a 100644 --- a/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java +++ b/src/com/engine/salary/wrapper/SalaryFormulaWrapper.java @@ -100,6 +100,12 @@ public class SalaryFormulaWrapper extends Service { welfareList.add(insuranceAcctDetailImportFieldDTO); } + + welfareList.add(new InsuranceAcctDetailImportFieldDTO("社保合计")); + welfareList.add(new InsuranceAcctDetailImportFieldDTO("公积金合计")); + welfareList.add(new InsuranceAcctDetailImportFieldDTO("其他福利合计")); + welfareList.add(new InsuranceAcctDetailImportFieldDTO("合计")); + return welfareList; } } From 0d1a77d81bf18f0e5bc4cb5aa57a0d9ed808eb34 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 16 Sep 2022 14:22:11 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A5=E5=8F=B7=E5=AD=97=E6=AE=B5=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=98=A0=E5=B0=84=E6=9C=89=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml index eceb9b1d5..4b5db25df 100644 --- a/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml +++ b/src/com/engine/salary/mapper/siarchives/SocialSchemeMapper.xml @@ -312,7 +312,7 @@ ( SELECT e.lastname AS userName, - e.jobtitle AS jobNum, + e.workcode AS jobNum, e.departmentid AS departmentId, d.departmentname AS departmentName, e.STATUS AS userStatus, From 280c979536677d44b040e329f48ecee7ddd31870 Mon Sep 17 00:00:00 2001 From: sy Date: Fri, 16 Sep 2022 15:03:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E5=85=A5=E4=BF=A1=E6=81=AF=E6=97=B6?= =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E5=A7=93=E5=90=8D=E5=AD=97=E6=AE=B5=E7=9A=84?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AddUpDeductionServiceImpl.java | 2 +- .../service/impl/AddUpSituationServiceImpl.java | 2 +- .../service/impl/AttendQuoteDataServiceImpl.java | 2 +- .../service/impl/OtherDeductionServiceImpl.java | 2 +- .../salary/service/impl/SIAccountServiceImpl.java | 2 +- .../salary/service/impl/SISchemeServiceImpl.java | 15 +++++++++++++-- .../service/impl/SalaryAcctExcelServiceImpl.java | 2 +- .../service/impl/SalaryArchiveServiceImpl.java | 2 +- 8 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index e23f8985c..ca99f5b1f 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -266,7 +266,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction .collect(Collectors.toList()); if (employeeSameIds.size() != 1) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "员工信息不能为空且不可重复(姓名、部门和手机号同时确认唯一)"); + errorMessageMap.put("message", rowIndex + "员工信息不存在或者存在多个员工"); errorData.add(errorMessageMap); errorSum += 1; }else{ diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index 2e68902dc..473eba426 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -640,7 +640,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation .collect(Collectors.toList()); if (employeeSameIds.size() != 1) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "员工信息不能为空且不可重复(姓名、部门和手机号同时确认唯一)"); + errorMessageMap.put("message", rowIndex + "员工信息不存在或者存在多个员工"); errorData.add(errorMessageMap); errorSum += 1; }else { diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java index 83664d354..ec817cf05 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java @@ -663,7 +663,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa errorSum += 1; } else if (CollectionUtils.isEmpty(employeeSameIds) || employeeSameIds.size() > 1) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", SalaryI18nUtil.getI18nLabel(100579, "员工信息不能为空且不可重复(姓名、部门和手机号同时确认唯一)")); + errorMessageMap.put("message", SalaryI18nUtil.getI18nLabel(100579, "员工信息不存在或者存在多个员工")); excelComments.add(errorMessageMap); errorSum += 1; } else { diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index dab18b68d..a1b9afe52 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -242,7 +242,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction errorSum += 1; } else if (CollectionUtils.isEmpty(employeeSameIds) || employeeSameIds.size() > 1) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "员工信息不能为空且不可重复(姓名、部门和手机号同时确认唯一)"); + errorMessageMap.put("message", rowIndex + "员工信息不存在或者存在多个员工"); errorData.add(errorMessageMap); errorSum += 1; } else { diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java index 19696a5d1..8a7b11a3f 100644 --- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java +++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java @@ -1125,7 +1125,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService { if (StringUtils.equals(SalaryI18nUtil.getI18nLabel(85429, "姓名"), dataKey.toString())) { //当人员信息导入筛选的全局配置为"0"时，姓名才是必填项 - if (StringUtils.isEmpty(dataValue) && "0".equals(salarySysConfPO.getConfValue())) { + if (StringUtils.isEmpty(dataValue) && "0".equals(salarySysConfPO.getConfValue())) { isError = true; Map errorMessageMap = Maps.newHashMap(); errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(102838, "姓名不能为空")); diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java index 732410042..8469d03ba 100644 --- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java +++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java @@ -2,6 +2,7 @@ package com.engine.salary.service.impl; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.TypeReference; +import com.api.formmode.mybatis.util.SqlProxyHandle; import com.cloudstore.eccom.pc.table.WeaTableColumn; import com.engine.common.util.ServiceUtil; import com.engine.core.impl.Service; @@ -34,11 +35,13 @@ import com.engine.salary.mapper.siarchives.SocialSchemeMapper; import com.engine.salary.mapper.sicategory.ICategoryMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeDetailMapper; import com.engine.salary.mapper.sischeme.InsuranceSchemeMapper; +import com.engine.salary.mapper.sys.SalarySysConfMapper; import com.engine.salary.mapper.taxagent.TaxAgentMapper; import com.engine.salary.service.SIImportService; import com.engine.salary.service.SISchemeService; import com.engine.salary.service.SalaryAcctEmployeeService; import com.engine.salary.service.TaxAgentService; +import com.engine.salary.sys.entity.po.SalarySysConfPO; import com.engine.salary.util.*; import com.engine.salary.util.db.MapperProxyFactory; import com.engine.salary.util.excel.ExcelParseHelper; @@ -122,6 +125,10 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { return (SalaryAcctEmployeeService) ServiceUtil.getService(SalaryAcctEmployeeServiceImpl.class, user); } + private SalarySysConfMapper getSalarySysConfMapper() { + return SqlProxyHandle.getProxy(SalarySysConfMapper.class); + } + @Override public Map getForm(Map params) { return commandExecutor.execute(new SISchemeGetFormCmd(params, user)); @@ -689,10 +696,14 @@ public class SISchemeServiceImpl extends Service implements SISchemeService { String userStatus = (String) singleAccount.get(3).get(SalaryI18nUtil.getI18nLabel(86187, "员工状态")); String workcode = (String) singleAccount.get(4).get(SalaryI18nUtil.getI18nLabel(86317, "工号")); + //查询对于人员信息导入筛选的全局配置 + SalarySysConfPO salarySysConfPO = getSalarySysConfMapper().getOneByCode("matchEmployeeMode"); + String rowIndex = "第" + index + "行"; - if (StringUtils.isBlank(userName) && StringUtils.isBlank(deparmentName) && StringUtils.isBlank(mobile) && StringUtils.isBlank(userStatus)) { + //仅在全局人员筛选配置为“0”时，才对用户名、部门名称、手机号有要求 + if (StringUtils.isBlank(userName) && StringUtils.isBlank(deparmentName) && StringUtils.isBlank(mobile) && "0".equals(salarySysConfPO.getConfValue())) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + " 用户名、部门名称、手机号、用户状态" + SalaryI18nUtil.getI18nLabel(100303, "不能同时为空")); + errorMessageMap.put("message", rowIndex + " 用户名、部门名称、手机号" + SalaryI18nUtil.getI18nLabel(100303, "不能同时为空")); excelComments.add(errorMessageMap); isError = true; } diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java index 68cba7639..3a4d85d35 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java @@ -656,7 +656,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc if (employeeSameIds.size() != 1) { isError = true; Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", row + "员工信息不能为空且不可重复(姓名、部门和手机号同时确认唯一)"); + errorMessageMap.put("message", row + "员工信息不存在或者存在多个员工"); excelComments.add(errorMessageMap); } else { employeeId = CollectionUtils.isNotEmpty(employeeSameIds) && employeeSameIds.size() == 1 ? employeeSameIds.get(0).getEmployeeId() : null; diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java index bd0cbf81f..dccaa28c7 100644 --- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java @@ -1049,7 +1049,7 @@ public class SalaryArchiveServiceImpl extends Service implements SalaryArchiveSe if (!isEmpty && userNameI18n.equals(key)) { if (CollectionUtils.isEmpty(employeeSameIds) || employeeSameIds.size() > 1) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowindex + "员工信息不能为空且不可重复(姓名、部门和手机号同时确认唯一)"); + errorMessageMap.put("message", rowindex + "员工信息不存在或者存在多个员工"); excelComments.add(errorMessageMap); isError = true; } else if (employeeId == null) {