Commit be87ffa0 authored by huyuchen's avatar huyuchen

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

parents 38facf47 ffbedc34
......@@ -506,7 +506,12 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
// 1:判断是否变更 商险待办 的项目
oldKey = this.getFiveKey(oldInsurance);
newDeptNo = newKeyDeptNoMap.get(oldKey);
if (Common.isNotNull(newDeptNo) && !newDeptNo.equals(oldInsurance.getDeptNo())) {
// 不同项目,在途(待确认、待派单、派单失败),要拦截
if (Common.isNotNull(newDeptNo) && !newDeptNo.equals(oldInsurance.getDeptNo())
&& !Common.isNotNull(oldInsurance.getProcessStatus())
&& (CommonConstants.ZERO_STRING.equals(oldInsurance.getProcessStatus())
|| CommonConstants.ONE_STRING.equals(oldInsurance.getProcessStatus())
|| CommonConstants.TWO_STRING.equals(oldInsurance.getProcessStatus()))) {
return R.failed("不可变更项目,请检查商险配置!");
}
oldMap.put(oldInsurance.getId(), oldInsurance);
......
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