Commit a2b0b8d9 authored by hongguangwu's avatar hongguangwu

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

parents 368f92df bf6c747e
......@@ -2786,11 +2786,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
.map(R::getMsg)
.orElse("未知错误");
errorMessageList.add(new ErrorMessage(excel.getRowIndex(),
"访问员工基础服务异常:" + errorMsg));
"访问员工基础服务异常:" + errorMsg, excel));
continue;
}
if (null == domainR.getData()){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "未查询到具体项目信息"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "未查询到具体项目信息", excel));
continue;
}
selectVo = domainR.getData();
......@@ -2798,13 +2798,13 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
}
//判断项目是否可用 (务状态:0 正常 1 停止服务 2 冻结)
if (!CommonConstants.ZERO_STRING.equals(selectVo.getStopFlag())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "项目不可用!"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "项目不可用!", excel));
continue;
}
//非管理员判断是否有项目权限
if (!isAdmin){
if (!deptNos.contains(excel.getDeptNo())){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "无项目权限!"));
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), "无项目权限!", excel));
continue;
}
}
......
......@@ -4524,8 +4524,8 @@ public class TInsuranceDetailServiceImpl extends ServiceImpl<TInsuranceDetailMap
if (Optional.ofNullable(insuranceType).isPresent()) {
// param.setIsAdress(insuranceType.getIsAdress());
if (CommonConstants.ZERO_STRING.equals(
insuranceType.getAgeLimit()) && (IdCardUtil.getFullAge(param.getEmpIdcardNo())
< CommonConstants.SIXTEEN_INT || IdCardUtil.getFullAge(param.getEmpIdcardNo())
insuranceType.getAgeLimit()) && (IdCardUtil.getFullAge(param.getReplaceEmpIdcardNo())
< CommonConstants.SIXTEEN_INT || IdCardUtil.getFullAge(param.getReplaceEmpIdcardNo())
> CommonConstants.SEVENTY)) {
param.setErrorMessage(InsurancesConstants.REPLACE_EMP_AGE_NOT_LEGITIMATE);
listResult.add(param);
......
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