Commit 48999790 authored by huyuchen's avatar huyuchen

huych-入离职登记增加附件和姓名身份证和手机号校验

parent 86d2961a
...@@ -1227,7 +1227,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi ...@@ -1227,7 +1227,7 @@ public class EmployeeRegistrationPreServiceImpl extends ServiceImpl<EmployeeRegi
URL url; URL url;
for (TAttaInfo a: attaInfo) { for (TAttaInfo a: attaInfo) {
url = ossUtil.getObjectUrl(null, a.getAttaSrc()); url = ossUtil.getObjectUrl(null, a.getAttaSrc());
a.setAttaUrl(url.toString()); a.setAttaUrl(null != url ? url.toString(): "");
} }
pre.setAttaList(attaInfo); pre.setAttaList(attaInfo);
} }
......
...@@ -1459,7 +1459,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1459,7 +1459,7 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
*/ */
private void updateFileId(EmployeeRegistration registration) { private void updateFileId(EmployeeRegistration registration) {
// 检查附件ID列表是否不为空 // 检查附件ID列表是否不为空
if (Common.isNotNull(registration.getAttaIdList())) { if (Common.isNotNull(registration.getAttaIdList()) && !registration.getAttaIdList().isEmpty()) {
// 创建更新条件构造器 // 创建更新条件构造器
LambdaUpdateWrapper<TCspAttaInfo> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<TCspAttaInfo> updateWrapper = new LambdaUpdateWrapper<>();
// 设置更新条件和新值 // 设置更新条件和新值
...@@ -1474,9 +1474,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr ...@@ -1474,9 +1474,11 @@ public class EmployeeRegistrationServiceImpl extends ServiceImpl<EmployeeRegistr
// 根据ID获取附件信息 // 根据ID获取附件信息
atta = tAttaInfoService.getById(id); atta = tAttaInfoService.getById(id);
// 更新附件的域名ID为当前员工的注册ID // 更新附件的域名ID为当前员工的注册ID
atta.setDomainId(registration.getId()); if (Common.isNotNull(atta)) {
// 保存更新后的附件信息 atta.setDomainId(registration.getId());
tAttaInfoService.updateById(atta); // 保存更新后的附件信息
tAttaInfoService.updateById(atta);
}
} }
} }
} }
......
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