From 07445c629b9f92505f2132e00423e5622e92e2d9 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期六, 13 三月 2021 18:59:39 +0800
Subject: [PATCH] xx

---
 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