From a704eb0aced975b55f39d71591ef87f2539e1263 Mon Sep 17 00:00:00 2001
From: luoyb <412940104@qq.com>
Date: 星期五, 12 三月 2021 09:21:57 +0800
Subject: [PATCH] fix(bug修复): 员工智搜导出字段调整
---
febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
index f41de30..00b80bb 100644
--- a/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
+++ b/febs-server/febs-server-hr/src/main/java/cc/mrbird/febs/server/hr/controller/EmpBaseInfoController.java
@@ -97,6 +97,9 @@
if(this.empBaseInfoService.verifyEmpNumb(empBaseinfo)){
throw new FebsException("已存在此员工编号:" + empBaseinfo.getEmpNumb());
}
+ if(this.empBaseInfoService.verifyCertificateNumb(empBaseinfo)){
+ throw new FebsException("已存在此身份证号:" + empBaseinfo.getCertificateNumb());
+ }
try {
this.empBaseInfoService.createEmpBaseInfo(empBaseinfo);
} catch (Exception e) {
@@ -227,10 +230,12 @@
empBadRecordService.importEmpBadRecord(listObject.get(12),returnList);
empRemarkinfoService.importEmpRemarkInfo(listObject.get(13),returnList);
}
- } catch (Exception e) {
+ }catch (IndexOutOfBoundsException e){
+ log.error("导入员工,下表越界", e);
+ }catch (Exception e) {
log.error("导入员工", e);
}
- return new FebsResponse().data(returnList);
+ return new FebsResponse().data(returnList);
}
@ApiOperation(value = "关闭员工档案")
--
Gitblit v1.8.0