Commit 4bf4d1d4 authored by hongguangwu's avatar hongguangwu

Merge branch 'MVP1.7.0' into develop

parents d5174ec9 d6322b2c
...@@ -3429,11 +3429,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3429,11 +3429,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeInfo.setPoliticalStatus(info.getPoliticalStatusValue()); tPreEmployeeInfo.setPoliticalStatus(info.getPoliticalStatusValue());
tPreEmployeeInfo.setEmpEmail(info.getEmpEmail()); tPreEmployeeInfo.setEmpEmail(info.getEmpEmail());
tPreEmployeeInfo.setEmpPhone(info.getEmpPhone()); tPreEmployeeInfo.setEmpPhone(info.getEmpPhone());
// 2024-10-30 20:02:53 测试jld认为如果没写户籍省,则带出档案。我认为有道理
if (Common.isNotNull(info.getIdProvinceValue())) { if (Common.isNotNull(info.getIdProvinceValue())) {
tPreEmployeeInfo.setIdProvince(Integer.parseInt(info.getIdProvinceValue())); tPreEmployeeInfo.setIdProvince(Integer.parseInt(info.getIdProvinceValue()));
} else {
tPreEmployeeInfo.setIdProvince(null);
}
if (Common.isNotNull(info.getIdCityValue())) { if (Common.isNotNull(info.getIdCityValue())) {
tPreEmployeeInfo.setIdCity(Integer.parseInt(info.getIdCityValue())); tPreEmployeeInfo.setIdCity(Integer.parseInt(info.getIdCityValue()));
} else { } else {
...@@ -3444,6 +3442,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3444,6 +3442,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} else { } else {
tPreEmployeeInfo.setIdTown(null); tPreEmployeeInfo.setIdTown(null);
} }
}
tPreEmployeeInfo.setEmpRegisType(info.getEmpRegisTypeValue()); tPreEmployeeInfo.setEmpRegisType(info.getEmpRegisTypeValue());
if (Common.isNotNull(info.getFileProvinceValue())) { if (Common.isNotNull(info.getFileProvinceValue())) {
tPreEmployeeInfo.setFileProvince(Integer.parseInt(info.getFileProvinceValue())); tPreEmployeeInfo.setFileProvince(Integer.parseInt(info.getFileProvinceValue()));
......
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