Commit 5bdb3f3c authored by fangxinjiang's avatar fangxinjiang

学历及学校优化-fxj

parent ba1e76dd
......@@ -2605,6 +2605,8 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_EDUCATION_NOT_EMPTY)));
return true;
}
//派单学历无值时,如果档案有值直接取值档案 2024-08-21 fxj
initEducation(excel, null, empVo);
// 根据社保户配置的collegeDegreeRequired字段判断是否必填学校
if (Common.isNotNull(socialHouseHoldInfo) && CommonConstants.ONE_STRING.equals(socialHouseHoldInfo.getCollegeDegreeRequired())) {
if (Common.isEmpty(excel.getSchoolName()) && Common.isEmpty(empVo.getSchool())) {
......@@ -2705,8 +2707,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
//如果档案有值直接取值档案 2024-08-21 fxj
excel.setEmpRegisType(empVo.getEmpRegisType());
}
//派单学历无值时,如果档案有值直接取值档案 2024-08-21 fxj
initEducation(excel, null, empVo);
if (Common.isEmpty(excel.getPost())) {
excel.setPost(empVo.getPost());
}
......
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