Commit badeec4b authored by huyuchen's avatar huyuchen

huych-合同自动化代码提交

parent f4a3aac7
...@@ -303,8 +303,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -303,8 +303,8 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
attaInfoService.update(updateWrapper); attaInfoService.update(updateWrapper);
//清空合同待签订数据 //清空合同待签订数据
if (preVo.getServerItem().contains("合同") && null != preVo.getEmployeeContractPreVos() && if (preVo.getServerItem().contains("合同") && null != preVo.getEmployeeContractPreVos() &&
(CommonConstants.ZERO_STRING.equals(preVo.getEmployeeContractPreVos().getContractFlag()) || Common.isNotNull(preVo.getEmployeeContractPreVos().getContractFlag()) &&
Common.isEmpty(preVo.getEmployeeContractPreVos().getContractFlag()))) { CommonConstants.ZERO_STRING.equals(preVo.getEmployeeContractPreVos().getContractFlag())) {
//查询老的合同明细 //查询老的合同明细
TEmployeeContractPre contractOld = contractPreMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda() TEmployeeContractPre contractOld = contractPreMapper.selectOne(Wrappers.<TEmployeeContractPre>query().lambda()
.eq(TEmployeeContractPre::getRegisterId,pre.getId()) .eq(TEmployeeContractPre::getRegisterId,pre.getId())
......
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