Commit 4fd0e170 authored by hongguangwu's avatar hongguangwu

MVP1.7.8-暂存不拦截

No related merge requests found
...@@ -1524,7 +1524,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1524,7 +1524,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
return R.failed("项目ID不可为空"); return R.failed("项目ID不可为空");
} }
String isSimple = registrationPreService.judgeIsSimple(idCard, main.getDeptId()); String isSimple = registrationPreService.judgeIsSimple(idCard, main.getDeptId());
if (CommonConstants.ONE_STRING.equals(isSimple) && !isSimple.equals(main.getIsSimple())) { if (CommonConstants.ONE_STRING.equals(status) && CommonConstants.ONE_STRING.equals(isSimple) && !isSimple.equals(main.getIsSimple())) {
return R.failed("员工类型或合同类型已变更,请刷新后重新提交!"); return R.failed("员工类型或合同类型已变更,请刷新后重新提交!");
} }
EmployeeRegistrationPre pre = registrationPreService.getPreInfo(idCard, main.getDeptId()); EmployeeRegistrationPre pre = registrationPreService.getPreInfo(idCard, main.getDeptId());
......
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