离职人员身份证不做重复校验

src/com/engine/organization/util/saveimport/hrmimport/HrmImportProcessE9.java

@@ -2530,9 +2530,9 @@ public class HrmImportProcessE9 extends BaseBean {
     public void getKeyMap(String keyField) {
         RecordSet recordSet = new RecordSet();
         String sql;
-        sql = "select id, accounttype,isADAccount,certificatenum,loginid,workcode, ltrim(rtrim(convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource";
+        sql = "select status,id, accounttype,isADAccount,certificatenum,loginid,workcode, ltrim(rtrim(convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource";
         if ("sqlserver".equalsIgnoreCase(recordSet.getDBType())) {
-            sql = "select id, accounttype,isADAccount,certificatenum,loginid,workcode, ltrim(rtrim(dbo.convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource";
+            sql = "select status,id, accounttype,isADAccount,certificatenum,loginid,workcode, ltrim(rtrim(dbo.convToMultiLang(ltrim(rtrim(" + keyField + "))," + userlanguage + "))) as " + keyField + " from hrmResource";
         }
         recordSet.execute(sql);
         String cerNum;
@@ -2556,7 +2556,11 @@ public class HrmImportProcessE9 extends BaseBean {
             String accounttype = recordSet.getString("accounttype");
             if (!"1".equalsIgnoreCase(accounttype)) {
                 if (StringUtil.isNotNull(cerNum)) {
-                    certificateNums.put(StringUtil.vString(cerNum), recordSet.getInt("id"));
+                    String status = Util.null2String(recordSet.getString("status"));
+                    // 离职状态的身份证号不做重复校验
+                    if (StringUtils.isNotBlank(status) && 4 < Integer.parseInt(status)) {
+                        certificateNums.put(StringUtil.vString(cerNum), recordSet.getInt("id"));
+                    }
                 }
             }
         }