Commit c4979969 authored by huyuchen's avatar huyuchen

huych-入职确认信息编辑提交

parent ae516030
...@@ -751,13 +751,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -751,13 +751,13 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
.eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT) .eq(TEmployeeContractInfo::getDeleteFlag, CommonConstants.ZERO_INT)
.last(CommonConstants.LAST_ONE_SQL)) > 0; .last(CommonConstants.LAST_ONE_SQL)) > 0;
if (employeeRegistrationPre.getServerItem().contains("合同")
&& Common.isNotNull(employeeRegistrationPre.getContractUpdateFlag())
&& employeeRegistrationPre.getContractUpdateFlag()) {
//查询老的合同明细 //查询老的合同明细
contractOld = contractPreMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda() contractOld = contractPreMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getRegisterId, employeeRegistrationPre.getId()) .eq(TEmployeeContractPre::getRegisterId, employeeRegistrationPre.getId())
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
if (employeeRegistrationPre.getServerItem().contains("合同")
&& Common.isNotNull(employeeRegistrationPre.getContractUpdateFlag())
&& employeeRegistrationPre.getContractUpdateFlag()) {
if (Common.isEmpty(employeeRegistrationPre.getEmployeeContractPre()) && !flag) { if (Common.isEmpty(employeeRegistrationPre.getEmployeeContractPre()) && !flag) {
errorTemp.append("未找到流程中或者在用的合同;"); errorTemp.append("未找到流程中或者在用的合同;");
......
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