Commit 172c2597 authored by huyuchen's avatar huyuchen

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

parents 10b7b0b7 2b02cff4
...@@ -509,17 +509,20 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -509,17 +509,20 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
preVo.setInsuranceCompanyName(insurancePreVo.getInsuranceCompanyName()); preVo.setInsuranceCompanyName(insurancePreVo.getInsuranceCompanyName());
preVo.setPolicyStart(insurancePreVo.getPolicyStart()); preVo.setPolicyStart(insurancePreVo.getPolicyStart());
preVo.setPolicyEnd(insurancePreVo.getPolicyEnd()); preVo.setPolicyEnd(insurancePreVo.getPolicyEnd());
checkVo = checkInsuranceExit(preVo); if (Common.isEmpty(insurancePreVo.getModelType())
if (null != checkVo) { || !CommonConstants.FOUR_STRING.equals(insurancePreVo.getModelType())) {
errorList.add(checkVo); checkVo = checkInsuranceExit(preVo);
} else { if (null != checkVo) {
if (Common.isNotNull(preVo.getProcessStatus())) { errorList.add(checkVo);
insurancePreVo.setProcessStatus(preVo.getProcessStatus());
} else { } else {
insurancePreVo.setProcessStatus(CommonConstants.ZERO_STRING); if (Common.isNotNull(preVo.getProcessStatus())) {
} insurancePreVo.setProcessStatus(preVo.getProcessStatus());
if (Common.isNotNull(preVo.getIsAddress())) { } else {
insurancePreVo.setIsAddress(preVo.getIsAddress()); insurancePreVo.setProcessStatus(CommonConstants.ZERO_STRING);
}
if (Common.isNotNull(preVo.getIsAddress())) {
insurancePreVo.setIsAddress(preVo.getIsAddress());
}
} }
} }
} }
......
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