Commit 4762cce9 authored by fangxinjiang's avatar fangxinjiang

拒绝入职优化-fxj

parent dddcdfbc
...@@ -1395,12 +1395,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1395,12 +1395,6 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
exitCheckVo.setEmpIdcard(registration.getEmpIdcard()); exitCheckVo.setEmpIdcard(registration.getEmpIdcard());
exitCheckVo.setDeptName(registration.getDeptName()); exitCheckVo.setDeptName(registration.getDeptName());
exitCheckVo.setDeptNo(registration.getDeptNo()); exitCheckVo.setDeptNo(registration.getDeptNo());
if (CommonConstants.THREE_STRING.equals(registration.getProcessStatus())) {
exitCheckVo.setType(preVo.getServerItem());
exitCheckVo.setErrorMsg("已拒绝入职,不可操作!");
errorList.add(exitCheckVo);
continue;
}
if (preVo.getServerItem().contains("商险") && !preVo.getEmployeeInsurancePreVos().isEmpty()) { if (preVo.getServerItem().contains("商险") && !preVo.getEmployeeInsurancePreVos().isEmpty()) {
//批量的商险是否已购买默认为否 //批量的商险是否已购买默认为否
if (Common.isEmpty(preVo.getInsuranceIsBuy())) { if (Common.isEmpty(preVo.getInsuranceIsBuy())) {
......
...@@ -1045,7 +1045,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur ...@@ -1045,7 +1045,7 @@ public class TEmployeeInsurancePreServiceImpl extends ServiceImpl<TEmployeeInsur
} }
// 已完成状态不需要更新 // 已完成状态不需要更新
if (CommonConstants.SIX_STRING.equals(insurancePre.getProcessStatus())) { if (null != insurancePre && CommonConstants.SIX_STRING.equals(insurancePre.getProcessStatus())) {
return false; return false;
} }
......
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