Commit cffcef32 authored by fangxinjiang's avatar fangxinjiang

试用期相关优化-fxj

parent 7cc60149
...@@ -1230,9 +1230,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1230,9 +1230,17 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
|| "标准合同".equals(employeeContractPreVo.getContractType())) { || "标准合同".equals(employeeContractPreVo.getContractType())) {
// 检查必要字段是否为空 关键字段不为空才校验 // 检查必要字段是否为空 关键字段不为空才校验
if (!Common.isEmpty(employeeContractPreVo.getContractTerm()) boolean flag = CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractTerm())
&& !Common.isEmpty(employeeContractPreVo.getTryPeriodNum()) && !Common.isEmpty(employeeContractPreVo.getTryPeriodNum())
&& CommonConstants.ZERO_STRING.equals(employeeContractPreVo.getTryPeriodType())) { && CommonConstants.ZERO_STRING.equals(employeeContractPreVo.getTryPeriodType());
if (!flag){
flag = CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractTerm())
&& !Common.isEmpty(employeeContractPreVo.getTryPeriodNum())
&& !"0".equals(employeeContractPreVo.getTryPeriodNum())
&& (CommonConstants.ONE_STRING.equals(employeeContractPreVo.getContractEndType())
|| CommonConstants.THREE_STRING.equals(employeeContractPreVo.getContractEndType()));
}
if (flag) {
// 安全解析试用期月数 // 安全解析试用期月数
int tryPeriodMonths = 0; int tryPeriodMonths = 0;
try { try {
......
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