Commit ec245151 authored by huyuchen's avatar huyuchen

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

parents bef4eb97 b73f8136
...@@ -489,7 +489,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -489,7 +489,9 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
} }
newKeyDeptNoMap.put(key, insurancePreVo.getDeptNo()); newKeyDeptNoMap.put(key, insurancePreVo.getDeptNo());
if (keyMap.get(key) == null) { if (keyMap.get(key) == null) {
keyMap.put(key, CommonConstants.ONE_INT); if (Common.isEmpty(insurancePreVo.getModelType()) || insurancePreVo.getModelType().equals(CommonConstants.THREE_STRING)) {
keyMap.put(key, CommonConstants.ONE_INT);
}
} else { } else {
return R.failed("保险公司、险种、购买标准、保单起、止日期不可同时重复!"); return R.failed("保险公司、险种、购买标准、保单起、止日期不可同时重复!");
} }
......
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