Commit 5a577c63 authored by hongguangwu's avatar hongguangwu

EKP1.7.8-优化BUG

parent 3ab3de64
...@@ -568,8 +568,8 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe ...@@ -568,8 +568,8 @@ public class TSalaryEmployeeServiceImpl extends ServiceImpl<TSalaryEmployeeMappe
if (Common.isNotNull(excel.getEmpIdcard())) { if (Common.isNotNull(excel.getEmpIdcard())) {
emp = empMap.get(excel.getEmpIdcard()); emp = empMap.get(excel.getEmpIdcard());
old = new TSalaryEmployee(); old = new TSalaryEmployee();
BeanUtil.copyProperties(emp,old); if (Common.isNotNull(emp) && Common.isNotNull(emp.getId())) {
if (Common.isNotNull(emp)) { BeanUtil.copyProperties(emp,old);
curTaxMonth = false; curTaxMonth = false;
if (Common.isNotNull(emp.getTaxMonth()) && Common.isNotNull(excel.getTaxMonth()) && emp.getTaxMonth().length()==6) { if (Common.isNotNull(emp.getTaxMonth()) && Common.isNotNull(excel.getTaxMonth()) && emp.getTaxMonth().length()==6) {
curTaxMonth = true; curTaxMonth = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment