Commit 373f5ac5 authored by fangxinjiang's avatar fangxinjiang

学历、户口性质调整-fxj

parent 5df647e4
...@@ -817,7 +817,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -817,7 +817,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(empVoMap)) { if (Common.isNotNull(empVoMap)) {
emp = empVoMap.get(excel.getEmpIdcard()); emp = empVoMap.get(excel.getEmpIdcard());
} }
if (Common.isEmpty(emp.getEmpRegisType()) && Common.isNotNull(excel.getEmpRegisType())){ if (Common.isNotNull(emp) && Common.isEmpty(emp.getEmpRegisType()) && Common.isNotNull(excel.getEmpRegisType())){
vo.setEmpRegisType(excel.getEmpRegisType()); vo.setEmpRegisType(excel.getEmpRegisType());
} }
if (Common.isNotNull(excel.getEducationName())) { if (Common.isNotNull(excel.getEducationName())) {
......
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