Commit 08e94eaa authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent a455812c
...@@ -692,10 +692,10 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -692,10 +692,10 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
return R.failed("未找到流程中或者在用的合同!"); return R.failed("未找到流程中或者在用的合同!");
} }
//是否已签署为否需要判断是否在用或者流程中的合同 //是否已签署为否需要判断是否在用或者流程中的合同
if ((CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag()) || CommonConstants.EMPTY_STRING.equals(employeeContractPreVo.getContractFlag())) && flag) { if ((CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag()) || Common.isEmpty(employeeContractPreVo.getContractFlag())) && flag) {
return R.failed("该项目下存在在途/有效的合同数据,请“是否已签署合同”是否调整为“是”"); return R.failed("该项目下存在在途/有效的合同数据,请“是否已签署合同”是否调整为“是”");
} }
if (CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag()) || CommonConstants.EMPTY_STRING.equals(employeeContractPreVo.getContractFlag())) { if (CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractFlag()) || Common.isEmpty(employeeContractPreVo.getContractFlag())) {
initContractPreInfo(employeeRegistrationPre,employeeContractPreVo, user, id); initContractPreInfo(employeeRegistrationPre,employeeContractPreVo, user, id);
employeeRegistrationPre.setEmployeeContractPre(employeeContractPreVo); employeeRegistrationPre.setEmployeeContractPre(employeeContractPreVo);
} else { } else {
......
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