Commit 663154ef authored by hongguangwu's avatar hongguangwu

MVP1.7.17-2000改为5条

parent 77648c12
......@@ -4769,11 +4769,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
if (Common.isNotNull(contractId)) {
returnVo.setResultIdThree(contractId);
returnVo.setResultIdThreeStatus("可用");
} else {
// 如果没有可用的,查找终止的,放在离职待办的详情里
contractId = contractServicer.getContractByEmpIdCardAndDeptNoByEnd(paramVo.getEmpIdCard(), paramVo.getDeptNo());
returnVo.setResultIdFourStatus(contractId);
}
// 如果没有可用的,查找终止的,放在离职待办的详情里
String contractEndId = contractServicer.getContractByEmpIdCardAndDeptNoByEnd(paramVo.getEmpIdCard(), paramVo.getDeptNo());
returnVo.setResultIdFourStatus(contractEndId);
}
return returnVo;
}
......
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