Commit c85c067c authored by hongguangwu's avatar hongguangwu

优化人员档案

parent c841d8bf
......@@ -1571,9 +1571,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp.setEmpPhone(excel.getEmpPhone());
}
// 判断空值
this.judgeNull(errorMsg, saveEmp);
// 校验手机号
if (Common.isNotNull(excel.getEmpPhone())) {
existEmp = existPhoneMap.get(excel.getEmpPhone());
......@@ -1653,7 +1650,6 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
}
}
// 户籍所在地
// 户籍所在地
if (Common.isNotNull(excel.getIdProvince())) {
areaStr = ExcelUtil.getRedisAreaValue("area_" + excel.getIdProvince().trim());
if (Common.isEmpty(areaStr)) {
......@@ -1779,6 +1775,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
saveEmp.setDeptNo(excel.getDeptNo());
}
}
// 判断空值
this.judgeNull(errorMsg, saveEmp);
// 更新时,不需要更新其余信息
newOld = new EmployeeNewOldVO();
newOld.setNewEmployee(saveEmp);
......
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