Commit 020dadb8 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.8' into MVP1.7.8

parents 16775d3d f03a2ee0
...@@ -1551,6 +1551,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1551,6 +1551,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (tPreEmployeeInfo != null) { if (tPreEmployeeInfo != null) {
if (Common.isNotNull(pre.getEmpPhone())) { if (Common.isNotNull(pre.getEmpPhone())) {
tPreEmployeeInfo.setEmpPhone(pre.getEmpPhone()); tPreEmployeeInfo.setEmpPhone(pre.getEmpPhone());
main.setEmpPhone(pre.getEmpPhone());
} }
if (Common.isNotNull(pre.getEmpNature())) { if (Common.isNotNull(pre.getEmpNature())) {
tPreEmployeeInfo.setEmpNatrue(pre.getEmpNature()); tPreEmployeeInfo.setEmpNatrue(pre.getEmpNature());
......
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