Commit 8ea513ab authored by fangxinjiang's avatar fangxinjiang

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

parents c1843c04 01844ec2
...@@ -1518,6 +1518,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1518,6 +1518,8 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
for (EmployeeRegistrationLeave leave : leaveList) { for (EmployeeRegistrationLeave leave : leaveList) {
// 判断了不等于 空、无需处理、完成,再去查合同 // 判断了不等于 空、无需处理、完成,再去查合同
if (judgeToQueryContract(isExit, doType, nowTime, leave) ) { if (judgeToQueryContract(isExit, doType, nowTime, leave) ) {
contractId = "";
contractIdEnd = "";
paramVo = new BaseSearchVO(); paramVo = new BaseSearchVO();
paramVo.setEmpIdCard(leave.getEmpIdcard()); paramVo.setEmpIdCard(leave.getEmpIdcard());
paramVo.setDeptNo(leave.getDeptNo()); paramVo.setDeptNo(leave.getDeptNo());
...@@ -1591,7 +1593,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe ...@@ -1591,7 +1593,7 @@ public class EmployeeRegistrationLeaveServiceImpl extends ServiceImpl<EmployeeRe
if (null != returnR && Common.isNotNull(returnR.getData())) { if (null != returnR && Common.isNotNull(returnR.getData())) {
returnVo = returnR.getData(); returnVo = returnR.getData();
if (Common.isEmpty(returnVo.getResultIdTwo())) { if (Common.isEmpty(returnVo.getResultIdTwo())) {
leave.setEmpProjectId(leave.getEmpIdOld()); leave.setEmpProjectId(leave.getEmpProjectIdOld());
leave.setCloseRemarkEmpProject(closeRemark); leave.setCloseRemarkEmpProject(closeRemark);
leave.setDoStatusProject(CommonConstants.ONE_STRING); leave.setDoStatusProject(CommonConstants.ONE_STRING);
} }
......
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