diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoParams.java b/src/com/engine/organization/entity/extend/param/ExtendInfoParams.java
index 50959aa5..8951002d 100644
--- a/src/com/engine/organization/entity/extend/param/ExtendInfoParams.java
+++ b/src/com/engine/organization/entity/extend/param/ExtendInfoParams.java
@@ -34,4 +34,13 @@ public class ExtendInfoParams {
      * 参数信息
      */
     private Map<String, Object> params;
+
+    /**
+     * Oracle主键自增序列名称
+     */
+    private String sequenceName;
+
+    public String getSequenceName() {
+        return this.tableName + "_ID";
+    }
 }
diff --git a/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.xml b/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.xml
index 28d40a6d..9b25823f 100644
--- a/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.xml
+++ b/src/com/engine/organization/mapper/codesetting/CodeRuleMapper.xml
@@ -27,9 +27,7 @@
     </update>
 
 
-    <insert id="insertCodeRule" parameterType="com.engine.organization.entity.codesetting.po.CodeRulePO"
-            keyProperty="id"
-            keyColumn="id" useGeneratedKeys="true">
+    <insert id="insertCodeRule" parameterType="com.engine.organization.entity.codesetting.po.CodeRulePO" >
         INSERT INTO JCL_CODERULE
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="creator != null">
diff --git a/src/com/engine/organization/mapper/comp/CompMapper.xml b/src/com/engine/organization/mapper/comp/CompMapper.xml
index 3d453442..6832e6b6 100644
--- a/src/com/engine/organization/mapper/comp/CompMapper.xml
+++ b/src/com/engine/organization/mapper/comp/CompMapper.xml
@@ -159,6 +159,97 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.company.po.CompPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_COMP_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_comp
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="compNo != null ">
+                comp_no,
+            </if>
+            <if test="compName != null ">
+                comp_name,
+            </if>
+            <if test="compNameShort != null ">
+                comp_name_short,
+            </if>
+            <if test="parentCompany != null ">
+                parent_company,
+            </if>
+            <if test="orgCode != null ">
+                org_code,
+            </if>
+            <if test="industry != null ">
+                industry,
+            </if>
+            <if test="compPrincipal != null ">
+                comp_principal,
+            </if>
+            <if test="description != null ">
+                description,
+            </if>
+            forbidden_tag,
+            <if test="showOrder != null ">
+                show_order,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="compNo != null ">
+                #{compNo},
+            </if>
+            <if test="compName != null ">
+                #{compName},
+            </if>
+            <if test="compNameShort != null ">
+                #{compNameShort},
+            </if>
+            <if test="parentCompany != null ">
+                #{parentCompany},
+            </if>
+            <if test="orgCode != null ">
+                #{orgCode},
+            </if>
+            <if test="industry != null ">
+                #{industry},
+            </if>
+            <if test="compPrincipal != null ">
+                #{compPrincipal},
+            </if>
+            <if test="description != null ">
+                #{description},
+            </if>
+            0,
+            <if test="showOrder != null ">
+                #{showOrder},
+            </if>
+        </trim>
+    </insert>
+
     <select id="list" resultMap="BaseResultMap">
         SELECT
         <include refid="baseColumns"/>
diff --git a/src/com/engine/organization/mapper/department/DepartmentMapper.xml b/src/com/engine/organization/mapper/department/DepartmentMapper.xml
index a21f999a..ccf5dcff 100644
--- a/src/com/engine/organization/mapper/department/DepartmentMapper.xml
+++ b/src/com/engine/organization/mapper/department/DepartmentMapper.xml
@@ -265,6 +265,91 @@
             0,
         </trim>
     </insert>
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.department.po.DepartmentPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_DEPT_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_dept
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+
+            <if test="deptNo != null ">
+                dept_no,
+            </if>
+            <if test="deptName != null ">
+                dept_name,
+            </if>
+            <if test="deptNameShort != null ">
+                dept_name_short,
+            </if>
+            <if test="parentComp != null ">
+                parent_comp,
+            </if>
+            <if test="parentDept != null ">
+                parent_dept,
+            </if>
+            <if test="deptPrincipal != null ">
+                dept_principal,
+            </if>
+            <if test="showOrder != null ">
+                show_order,
+            </if>
+            <if test="description != null ">
+                description,
+            </if>
+            forbidden_tag,
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="deptNo != null ">
+                #{deptNo},
+            </if>
+            <if test="deptName != null ">
+                #{deptName},
+            </if>
+            <if test="deptNameShort != null ">
+                #{deptNameShort},
+            </if>
+            <if test="parentComp != null ">
+                #{parentComp},
+            </if>
+            <if test="parentDept != null ">
+                #{parentDept},
+            </if>
+            <if test="deptPrincipal != null ">
+                #{deptPrincipal},
+            </if>
+            <if test="showOrder != null ">
+                #{showOrder},
+            </if>
+            <if test="description != null ">
+                #{description},
+            </if>
+            0,
+        </trim>
+    </insert>
 
     <update id="updateBaseDept" parameterType="com.engine.organization.entity.department.po.DepartmentPO">
         update jcl_org_dept
diff --git a/src/com/engine/organization/mapper/extend/ExtMapper.xml b/src/com/engine/organization/mapper/extend/ExtMapper.xml
index 05c24278..69cde37a 100644
--- a/src/com/engine/organization/mapper/extend/ExtMapper.xml
+++ b/src/com/engine/organization/mapper/extend/ExtMapper.xml
@@ -17,6 +17,23 @@
         )
     </insert>
 
+    <insert id="insertExt" parameterType="com.engine.organization.entity.extend.param.ExtendInfoParams" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select ${sequenceName}.currval from dual
+        </selectKey>
+
+        insert into ${tableName} (
+        <foreach collection="params" item="value" index="key" separator=",">
+            ${key}
+        </foreach>
+        )
+        values (
+        <foreach collection="params" item="value" index="key" separator=",">
+            #{value}
+        </foreach>
+        )
+    </insert>
+
     <update id="updateExt" parameterType="com.engine.organization.entity.extend.param.ExtendInfoParams">
         update ${tableName} set
         <foreach collection="params" item="value" index="key" separator=",">
diff --git a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
index 2aa5a5ad..d5b6754c 100644
--- a/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
+++ b/src/com/engine/organization/mapper/extend/ExtendGroupMapper.xml
@@ -148,6 +148,79 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.extend.po.ExtendGroupPO" databaseId="oracle">
+
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_FIELD_GROUP_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_field_extendgroup
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+
+            <if test="extendType != null ">
+                extend_type,
+            </if>
+            <if test="groupName != null ">
+                group_name,
+            </if>
+            <if test="pid != null ">
+                pid,
+            </if>
+            <if test="isShow != null ">
+                is_show,
+            </if>
+            <if test="showOrder != null ">
+                show_order,
+            </if>
+            <if test="isSystemDefault != null ">
+                is_system_default,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="extendType != null ">
+                #{extendType},
+            </if>
+            <if test="groupName != null ">
+                #{groupName},
+            </if>
+            <if test="pid != null ">
+                #{pid},
+            </if>
+            <if test="isShow != null ">
+                #{isShow},
+            </if>
+            <if test="showOrder != null ">
+                #{showOrder},
+            </if>
+            <if test="isSystemDefault != null ">
+                #{isSystemDefault},
+            </if>
+        </trim>
+    </insert>
+
     <update id="update">
         update jcl_field_extendgroup
         <set>
diff --git a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
index 3b25570c..38f2a5fc 100644
--- a/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
+++ b/src/com/engine/organization/mapper/extend/ExtendInfoMapper.xml
@@ -196,9 +196,152 @@
             </if>
         </trim>
     </insert>
+
+    <insert id="insertExtendInfo" parameterType="com.engine.organization.entity.extend.po.ExtendInfoPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_FIELD_INFO_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_field_extendinfo
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="extendType != null ">
+                extend_type,
+            </if>
+            <if test="tableName != null ">
+                table_name,
+            </if>
+            <if test="fieldName != null ">
+                field_name,
+            </if>
+            <if test="fieldNameDesc != null ">
+                field_name_desc,
+            </if>
+            <if test="fieldType != null ">
+                field_type,
+            </if>
+            <if test="controlType != null ">
+                control_type,
+            </if>
+            <if test="browserType != null ">
+                browser_type,
+            </if>
+            <if test="extendGroupId != null ">
+                extend_group_id,
+            </if>
+            <if test="isenable != null ">
+                isenable,
+            </if>
+            <if test="isrequired != null ">
+                isrequired,
+            </if>
+            <if test="listShow != null ">
+                list_show,
+            </if>
+            <if test="searchShow != null ">
+                search_show,
+            </if>
+            <if test="editShow != null ">
+                edit_show,
+            </if>
+            <if test="addShow != null ">
+                add_show,
+            </if>
+            <if test="browserShow != null ">
+                browser_show,
+            </if>
+            <if test="customValue != null ">
+                custom_value,
+            </if>
+            <if test="showOrder != null ">
+                show_order,
+            </if>
+            <if test="isSystemDefault != null ">
+                is_system_default,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="extendType != null ">
+                #{extendType},
+            </if>
+            <if test="tableName != null ">
+                #{tableName},
+            </if>
+            <if test="fieldName != null ">
+                #{fieldName},
+            </if>
+            <if test="fieldNameDesc != null ">
+                #{fieldNameDesc},
+            </if>
+            <if test="fieldType != null ">
+                #{fieldType},
+            </if>
+            <if test="controlType != null ">
+                #{controlType},
+            </if>
+            <if test="browserType != null ">
+                #{browserType},
+            </if>
+            <if test="extendGroupId != null ">
+                #{extendGroupId},
+            </if>
+            <if test="isenable != null ">
+                #{isenable},
+            </if>
+            <if test="isrequired != null ">
+                #{isrequired},
+            </if>
+            <if test="listShow != null ">
+                #{listShow},
+            </if>
+            <if test="searchShow != null ">
+                #{searchShow},
+            </if>
+            <if test="editShow != null ">
+                #{editShow},
+            </if>
+            <if test="addShow != null ">
+                #{addShow},
+            </if>
+            <if test="browserShow != null ">
+                #{browserShow},
+            </if>
+            <if test="customValue != null ">
+                #{customValue},
+            </if>
+            <if test="showOrder != null ">
+                #{showOrder},
+            </if>
+            <if test="isSystemDefault != null ">
+                #{isSystemDefault},
+            </if>
+        </trim>
+    </insert>
     <update id="addTableColumn">
         ALTER TABLE ${tableName}
-            ADD ${fieldName} ${dbType} NULL;
+            ADD ${fieldName} ${dbType} NULL
     </update>
     <update id="updateExtendInfo" parameterType="com.engine.organization.entity.extend.po.ExtendInfoPO">
         update jcl_field_extendinfo
@@ -226,7 +369,7 @@
         ALTER TABLE ${tableName}
         DROP
         COLUMN
-        ${fieldName};
+        ${fieldName}
     </update>
     <update id="updateExtendGroupId">
         UPDATE jcl_field_extendinfo
diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml
index 62cff4b5..a195985d 100644
--- a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml
+++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml
@@ -94,6 +94,76 @@
             </if>
         </trim>
     </insert>
+
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.extend.po.ExtendTitlePO" databaseId="oracle">
+
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_FIELD_TITLE_ID.currval from dual
+        </selectKey>
+
+        INSERT INTO jcl_field_extendtitle
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+
+            <if test="groupId != null ">
+                group_id,
+            </if>
+            <if test="title != null ">
+                title,
+            </if>
+            <if test="showOrder != null ">
+                show_order,
+            </if>
+            <if test="isShow != null ">
+                is_show,
+            </if>
+            <if test="isSystemDefault != null ">
+                is_system_default,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="groupId != null ">
+                #{groupId},
+            </if>
+            <if test="title != null ">
+                #{title},
+            </if>
+
+            <if test="showOrder != null ">
+                #{showOrder},
+            </if>
+            <if test="isShow != null ">
+                #{isShow},
+            </if>
+            <if test="isSystemDefault != null ">
+                #{isSystemDefault},
+            </if>
+        </trim>
+    </insert>
+
     <update id="updateExtendTitle" parameterType="com.engine.organization.entity.extend.po.ExtendTitlePO">
         update jcl_field_extendtitle
         <set>
diff --git a/src/com/engine/organization/mapper/jclimport/JclImportHistoryDetailMapper.xml b/src/com/engine/organization/mapper/jclimport/JclImportHistoryDetailMapper.xml
index 477a7c99..b57066be 100644
--- a/src/com/engine/organization/mapper/jclimport/JclImportHistoryDetailMapper.xml
+++ b/src/com/engine/organization/mapper/jclimport/JclImportHistoryDetailMapper.xml
@@ -60,6 +60,48 @@
             </if>
         </trim>
     </insert>
+
+    <insert id="insertHistoryDetail"  parameterType="com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_IMPORT_DETAIL_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_import_history_detail
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="pid != null">
+                pid,
+            </if>
+            <if test="rowNums != null">
+                row_nums,
+            </if>
+            <if test="status != null">
+                status,
+            </if>
+            <if test="operateDetail != null">
+                operate_detail,
+            </if>
+            <if test="relatedName != null ">
+                related_name,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="pid != null">
+                #{pid},
+            </if>
+            <if test="rowNums != null">
+                #{rowNums},
+            </if>
+            <if test="status != null">
+                #{status},
+            </if>
+            <if test="operateDetail != null">
+                #{operateDetail},
+            </if>
+            <if test="relatedName != null ">
+                #{relatedName},
+            </if>
+        </trim>
+    </insert>
+
     <select id="countRows" resultType="java.lang.Integer">
         select count(1)
         from jcl_import_history_detail
diff --git a/src/com/engine/organization/mapper/jclimport/JclImportHistoryMapper.xml b/src/com/engine/organization/mapper/jclimport/JclImportHistoryMapper.xml
index 05e88c63..e889525c 100644
--- a/src/com/engine/organization/mapper/jclimport/JclImportHistoryMapper.xml
+++ b/src/com/engine/organization/mapper/jclimport/JclImportHistoryMapper.xml
@@ -77,6 +77,61 @@
 
         </trim>
     </insert>
+
+    <insert id="insertHistory" parameterType="com.engine.organization.entity.jclimport.po.JclImportHistoryPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_IMPORT_HISTORY_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_import_history
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="operator != null">
+                operator,
+            </if>
+            <if test="operateTime != null">
+                operate_time,
+            </if>
+            <if test="clientAddress != null">
+                client_address,
+            </if>
+            <if test="importType != null">
+                import_type,
+            </if>
+            <if test="sourceFrom != null ">
+                source_from,
+            </if>
+            <if test="operateType != null ">
+                operate_type,
+            </if>
+            <if test="status != null ">
+                status,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="operator != null">
+                #{operator},
+            </if>
+            <if test="operateTime != null">
+                #{operateTime},
+            </if>
+            <if test="clientAddress != null">
+                #{clientAddress},
+            </if>
+            <if test="importType != null">
+                #{importType},
+            </if>
+            <if test="sourceFrom != null ">
+                #{sourceFrom},
+            </if>
+            <if test="operateType != null ">
+                #{operateType},
+            </if>
+            <if test="status != null ">
+                #{status},
+            </if>
+
+        </trim>
+    </insert>
+
     <update id="updateHistoryStatus">
         update jcl_import_history
         set status = #{status}
diff --git a/src/com/engine/organization/mapper/job/JobMapper.xml b/src/com/engine/organization/mapper/job/JobMapper.xml
index 45b10614..15158253 100644
--- a/src/com/engine/organization/mapper/job/JobMapper.xml
+++ b/src/com/engine/organization/mapper/job/JobMapper.xml
@@ -163,6 +163,124 @@
             0,
         </trim>
     </insert>
+
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.job.po.JobPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_JOB_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_job
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+
+            <if test="jobNo != null ">
+                job_no,
+            </if>
+            <if test="jobName != null ">
+                job_name,
+            </if>
+            <if test="parentComp != null ">
+                parent_comp,
+            </if>
+            <if test="parentDept != null ">
+                parent_dept,
+            </if>
+            <if test="sequenceId != null ">
+                sequence_id,
+            </if>
+            <if test="schemeId != null ">
+                scheme_id,
+            </if>
+            <if test="parentJob != null ">
+                parent_job,
+            </if>
+            <if test="isKey != null ">
+                is_key,
+            </if>
+            <if test="workplace != null ">
+                workplace,
+            </if>
+            <if test="description != null ">
+                description,
+            </if>
+            <if test="workDuty != null ">
+                work_duty,
+            </if>
+            <if test="workAuthority != null ">
+                work_authority,
+            </if>
+            <if test="showOrder != null ">
+                show_order,
+            </if>
+            forbidden_tag,
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="jobNo != null ">
+                #{jobNo},
+            </if>
+            <if test="jobName != null ">
+                #{jobName},
+            </if>
+
+            <if test="parentComp != null ">
+                #{parentComp},
+            </if>
+            <if test="parentDept != null ">
+                #{parentDept},
+            </if>
+            <if test="sequenceId != null ">
+                #{sequenceId},
+            </if>
+            <if test="schemeId != null ">
+                #{schemeId},
+            </if>
+            <if test="parentJob != null ">
+                #{parentJob},
+            </if>
+            <if test="isKey != null ">
+                #{isKey},
+            </if>
+            <if test="workplace != null ">
+                #{workplace},
+            </if>
+            <if test="description != null ">
+                #{description},
+            </if>
+            <if test="workDuty != null ">
+                #{workDuty},
+            </if>
+            <if test="workAuthority != null ">
+                #{workAuthority},
+            </if>
+            <if test="showOrder != null ">
+                #{showOrder},
+            </if>
+            0,
+        </trim>
+    </insert>
+
     <update id="updateBaseJob" parameterType="com.engine.organization.entity.job.po.JobPO">
         update jcl_org_job
         <set>
diff --git a/src/com/engine/organization/mapper/post/PostInfoMapper.xml b/src/com/engine/organization/mapper/post/PostInfoMapper.xml
index 7781a8ea..b77819b3 100644
--- a/src/com/engine/organization/mapper/post/PostInfoMapper.xml
+++ b/src/com/engine/organization/mapper/post/PostInfoMapper.xml
@@ -168,6 +168,85 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.postion.po.PostInfoPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_POST_INFO_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_post_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="postInfoNo != null">
+                post_info_no,
+            </if>
+            <if test="postInfoName != null">
+                post_info_name,
+            </if>
+            <if test="postInfoAuthority != null">
+                post_info_authority,
+            </if>
+            <if test="postInfoDuty != null">
+                post_info_duty,
+            </if>
+            <if test="postInfoQualification != null">
+                post_info_qualification,
+            </if>
+            <if test="postId != null">
+                post_id,
+            </if>
+            <if test="description != null">
+                description,
+            </if>
+            forbidden_tag,
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="postInfoNo != null">
+                #{postInfoNo},
+            </if>
+            <if test="postInfoName != null">
+                #{postInfoName},
+            </if>
+            <if test="postInfoAuthority != null">
+                #{postInfoAuthority},
+            </if>
+            <if test="postInfoDuty != null">
+                #{postInfoDuty},
+            </if>
+            <if test="postInfoQualification != null">
+                #{postInfoQualification},
+            </if>
+            <if test="postId != null">
+                #{postId},
+            </if>
+            <if test="description != null">
+                #{description},
+            </if>
+            0,
+        </trim>
+    </insert>
+
     <update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.postion.po.PostInfoPO">
         update jcl_org_post_info
         <set>
diff --git a/src/com/engine/organization/mapper/post/PostMapper.xml b/src/com/engine/organization/mapper/post/PostMapper.xml
index 2ab3c223..b10eb867 100644
--- a/src/com/engine/organization/mapper/post/PostMapper.xml
+++ b/src/com/engine/organization/mapper/post/PostMapper.xml
@@ -125,6 +125,52 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.postion.po.PostPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_POST_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_post
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="postName != null ">
+                post_name,
+            </if>
+            <if test="description != null ">
+                description,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="postName != null ">
+                #{postName},
+            </if>
+            <if test="description != null ">
+                #{description},
+            </if>
+        </trim>
+    </insert>
 
     <update id="deleteByIds">
         UPDATE jcl_org_post
diff --git a/src/com/engine/organization/mapper/scheme/GradeMapper.xml b/src/com/engine/organization/mapper/scheme/GradeMapper.xml
index da872da4..1f0a094a 100644
--- a/src/com/engine/organization/mapper/scheme/GradeMapper.xml
+++ b/src/com/engine/organization/mapper/scheme/GradeMapper.xml
@@ -157,6 +157,73 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.scheme.po.GradePO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_GRADE_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_grade
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="gradeNo != null ">
+                grade_no,
+            </if>
+            <if test="gradeName != null ">
+                grade_name,
+            </if>
+            <if test="description != null ">
+                description,
+            </if>
+            <if test="schemeId != null ">
+                scheme_id,
+            </if>
+            <if test="levelId != null ">
+                level_id,
+            </if>
+            forbidden_tag,
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="gradeNo != null ">
+                #{gradeNo},
+            </if>
+            <if test="gradeName != null ">
+                #{gradeName},
+            </if>
+            <if test="description != null ">
+                #{description},
+            </if>
+            <if test="schemeId != null ">
+                #{schemeId},
+            </if>
+            <if test="levelId != null ">
+                #{levelId},
+            </if>
+            0,
+        </trim>
+    </insert>
+
     <update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.scheme.po.GradePO">
         update jcl_org_grade
         <set>
diff --git a/src/com/engine/organization/mapper/scheme/LevelMapper.xml b/src/com/engine/organization/mapper/scheme/LevelMapper.xml
index f9b961c7..46b1e32d 100644
--- a/src/com/engine/organization/mapper/scheme/LevelMapper.xml
+++ b/src/com/engine/organization/mapper/scheme/LevelMapper.xml
@@ -162,6 +162,67 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.scheme.po.LevelPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_LEVEL_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_level
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="levelNo != null ">
+                level_no,
+            </if>
+            <if test="levelName != null ">
+                level_name,
+            </if>
+            <if test="description != null ">
+                description,
+            </if>
+            <if test="schemeId != null ">
+                scheme_id,
+            </if>
+            forbidden_tag,
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="levelNo != null ">
+                #{levelNo},
+            </if>
+            <if test="levelName != null ">
+                #{levelName},
+            </if>
+            <if test="description != null ">
+                #{description},
+            </if>
+            <if test="schemeId != null ">
+                #{schemeId},
+            </if>
+            0,
+        </trim>
+    </insert>
+
     <update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.scheme.po.LevelPO">
         update jcl_org_level
         <set>
diff --git a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
index e7c8a485..d7ac5226 100644
--- a/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
+++ b/src/com/engine/organization/mapper/scheme/SchemeMapper.xml
@@ -142,6 +142,61 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.scheme.po.SchemePO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_SCHEME_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_scheme
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="schemeNo != null ">
+                scheme_no,
+            </if>
+            <if test="schemeName != null ">
+                scheme_name,
+            </if>
+            <if test="schemeDescription != null ">
+                scheme_description,
+            </if>
+            forbidden_tag,
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="schemeNo != null ">
+                #{schemeNo},
+            </if>
+            <if test="schemeName != null ">
+                #{schemeName},
+            </if>
+            <if test="schemeDescription != null ">
+                #{schemeDescription},
+            </if>
+            0,
+        </trim>
+    </insert>
+
     <update id="updateScheme" parameterType="com.engine.organization.entity.scheme.po.SchemePO">
         update jcl_org_scheme
         <set>
diff --git a/src/com/engine/organization/mapper/sequence/SequenceMapper.xml b/src/com/engine/organization/mapper/sequence/SequenceMapper.xml
index eed364eb..b5a912b0 100644
--- a/src/com/engine/organization/mapper/sequence/SequenceMapper.xml
+++ b/src/com/engine/organization/mapper/sequence/SequenceMapper.xml
@@ -63,6 +63,7 @@
     <select id="listUsedId" resultType="java.lang.String">
         select sequence_id
         from JCL_ORG_JOB
+        where delete_type = 0
     </select>
     <select id="getSequencesByIds" resultMap="BaseResultMap">
         select
@@ -152,6 +153,67 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.sequence.po.SequencePO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_SEQUENCE_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_sequence
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="sequenceNo != null ">
+                sequence_no,
+            </if>
+            <if test="sequenceName != null ">
+                sequence_name,
+            </if>
+            <if test="description != null ">
+                description,
+            </if>
+            <if test="schemeId != null ">
+                scheme_id,
+            </if>
+            forbidden_tag,
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="sequenceNo != null ">
+                #{sequenceNo},
+            </if>
+            <if test="sequenceName != null ">
+                #{sequenceName},
+            </if>
+            <if test="description != null ">
+                #{description},
+            </if>
+            <if test="schemeId != null ">
+                #{schemeId},
+            </if>
+            0,
+        </trim>
+    </insert>
+
     <update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.sequence.po.SequencePO">
         update jcl_org_sequence
         <set>
diff --git a/src/com/engine/organization/mapper/sislog/SISLogMapper.xml b/src/com/engine/organization/mapper/sislog/SISLogMapper.xml
index 5c376b9f..7fce8b95 100644
--- a/src/com/engine/organization/mapper/sislog/SISLogMapper.xml
+++ b/src/com/engine/organization/mapper/sislog/SISLogMapper.xml
@@ -34,8 +34,46 @@
 
     <!-- 插入全部字段 -->
     <insert id="insert" parameterType="com.engine.organization.entity.LoggerContext"
-            keyProperty="id" keyColumn="id" useGeneratedKeys="true"
-    >
+            keyProperty="id" keyColumn="id" useGeneratedKeys="true">
+        INSERT INTO hr_log
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            operate_desc,
+            operator_id,
+            operator_name,
+            create_time,
+            operate_type,
+            params_str,
+            client_ip,
+            method_name,
+            class_name,
+            delete_type,
+            operate_module_name,
+            operate_module,
+            message,
+            value
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            #{operateDesc},
+            #{operatorId},
+            #{operatorName},
+            #{createTime},
+            #{operateType},
+            #{paramsStr},
+            #{clientIp},
+            #{methodName},
+            #{className},
+            #{deleteType},
+            #{operateModuleName},
+            #{operateModule},
+            #{message},
+            #{value}
+        </trim>
+    </insert>
+
+    <insert id="insert" parameterType="com.engine.organization.entity.LoggerContext" databaseId="oracle">
+        <selectKey keyProperty="id" resultType="long" order="AFTER">
+            select HR_LOG_ID.currval from dual
+        </selectKey>
         INSERT INTO hr_log
         <trim prefix="(" suffix=")" suffixOverrides=",">
             operate_desc,
diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.xml b/src/com/engine/organization/mapper/staff/StaffMapper.xml
index 26a7ac70..eac374a4 100644
--- a/src/com/engine/organization/mapper/staff/StaffMapper.xml
+++ b/src/com/engine/organization/mapper/staff/StaffMapper.xml
@@ -195,6 +195,108 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.staff.po.StaffPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_STAFF_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_staff
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="planId != null ">
+                plan_id,
+            </if>
+            <if test="compId != null ">
+                comp_id,
+            </if>
+            <if test="deptId != null ">
+                dept_id,
+            </if>
+            <if test="jobId != null ">
+                job_id,
+            </if>
+            <if test="staffNum != null ">
+                staff_num,
+            </if>
+            <if test="controlPolicy != null ">
+                control_policy,
+            </if>
+            <if test="permanentNum != null ">
+                permanent_num,
+            </if>
+            <if test="freezeNum != null ">
+                freeze_num,
+            </if>
+            <if test="lackStatus != null ">
+                lack_status,
+            </if>
+            <if test="staffDesc != null ">
+                staff_desc,
+            </if>
+            <if test="description != null ">
+                description,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+
+            <if test="planId != null ">
+                #{planId},
+            </if>
+            <if test="compId != null ">
+                #{compId},
+            </if>
+            <if test="deptId != null ">
+                #{deptId},
+            </if>
+            <if test="jobId != null ">
+                #{jobId},
+            </if>
+            <if test="staffNum != null ">
+                #{staffNum},
+            </if>
+            <if test="controlPolicy != null ">
+                #{controlPolicy},
+            </if>
+            <if test="permanentNum != null ">
+                #{permanentNum},
+            </if>
+            <if test="freezeNum != null ">
+                #{freezeNum},
+            </if>
+            <if test="lackStatus != null ">
+                #{lackStatus},
+            </if>
+            <if test="staffDesc != null ">
+                #{staffDesc},
+            </if>
+            <if test="description != null ">
+                #{description},
+            </if>
+        </trim>
+    </insert>
+
     <update id="deleteByIds">
         UPDATE jcl_org_staff
         SET delete_type = 1
diff --git a/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml b/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml
index 0b613214..cb7e8789 100644
--- a/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml
+++ b/src/com/engine/organization/mapper/staff/StaffPlanMapper.xml
@@ -177,6 +177,91 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.staff.po.StaffPlanPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_STAFFPLAN_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_staffplan
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="planNo != null ">
+                plan_no,
+            </if>
+            <if test="planName != null ">
+                plan_name,
+            </if>
+            <if test="planYear != null ">
+                plan_year,
+            </if>
+            <if test="timeStart != null ">
+                time_start,
+            </if>
+            <if test="timeEnd != null ">
+                time_end,
+            </if>
+            <if test="companyId != null ">
+                company_id,
+            </if>
+            <if test="controlDimension != null ">
+                control_dimension,
+            </if>
+            <if test="description != null ">
+                description,
+            </if>
+            forbidden_tag,
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+            <if test="planNo != null ">
+                #{planNo},
+            </if>
+            <if test="planName != null ">
+                #{planName},
+            </if>
+            <if test="planYear != null ">
+                #{planYear},
+            </if>
+            <if test="timeStart != null ">
+                #{timeStart},
+            </if>
+            <if test="timeEnd != null ">
+                #{timeEnd},
+            </if>
+            <if test="companyId != null ">
+                #{companyId},
+            </if>
+            <if test="controlDimension != null ">
+                #{controlDimension},
+            </if>
+            <if test="description != null ">
+                #{description},
+            </if>
+            0,
+        </trim>
+    </insert>
+
     <update id="updateForbiddenTagById" parameterType="com.engine.organization.entity.staff.po.StaffPlanPO">
         update jcl_org_staffplan
         <set>
diff --git a/src/com/engine/organization/mapper/staff/StaffsMapper.xml b/src/com/engine/organization/mapper/staff/StaffsMapper.xml
index 7460adb2..9661914c 100644
--- a/src/com/engine/organization/mapper/staff/StaffsMapper.xml
+++ b/src/com/engine/organization/mapper/staff/StaffsMapper.xml
@@ -98,4 +98,76 @@
         </trim>
     </insert>
 
+    <insert id="insertIgnoreNull" parameterType="com.engine.organization.entity.staff.po.StaffsPO" databaseId="oracle">
+        <selectKey  keyProperty="id" resultType="long" order="AFTER">
+            select JCL_ORG_STAFFS_ID.currval from dual
+        </selectKey>
+        INSERT INTO jcl_org_staffs
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                creator,
+            </if>
+            <if test="deleteType != null">
+                delete_type,
+            </if>
+            <if test="createTime != null">
+                create_time,
+            </if>
+            <if test="updateTime != null">
+                update_time,
+            </if>
+            <if test="staffId != null ">
+                staff_id,
+            </if>
+            <if test="businessType != null ">
+                business_type,
+            </if>
+            <if test="changeNum != null ">
+                change_num,
+            </if>
+            <if test="businessSource != null ">
+                business_source,
+            </if>
+            <if test="requestId != null ">
+                requestid,
+            </if>
+            <if test="description != null ">
+                description,
+            </if>
+        </trim>
+        <trim prefix="VALUES (" suffix=")" suffixOverrides=",">
+            <if test="creator != null">
+                #{creator},
+            </if>
+            <if test="deleteType != null">
+                #{deleteType},
+            </if>
+            <if test="createTime != null">
+                #{createTime},
+            </if>
+            <if test="updateTime != null">
+                #{updateTime},
+            </if>
+
+            <if test="staffId != null ">
+                #{staffId},
+            </if>
+            <if test="businessType != null ">
+                #{businessType},
+            </if>
+            <if test="changeNum != null ">
+                #{changeNum},
+            </if>
+            <if test="businessSource != null ">
+                #{businessSource},
+            </if>
+            <if test="requestId != null ">
+                #{requestId},
+            </if>
+            <if test="description != null ">
+                #{description},
+            </if>
+        </trim>
+    </insert>
+
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/organization/service/ImportCommonService.java b/src/com/engine/organization/service/ImportCommonService.java
index 5845a34f..a5545e26 100644
--- a/src/com/engine/organization/service/ImportCommonService.java
+++ b/src/com/engine/organization/service/ImportCommonService.java
@@ -1,7 +1,5 @@
 package com.engine.organization.service;
 
-import weaver.hrm.User;
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.Map;
 
@@ -11,26 +9,6 @@ import java.util.Map;
  * @version: 1.0
  */
 public interface ImportCommonService {
-    /**
-     * 人员导入
-     *
-     * @param params
-     * @param request
-     * @return
-     */
-    Map<String, Object> saveImportResource(Map<String, Object> params, HttpServletRequest request);
-
-
-    /**
-     * 通用导入
-     *
-     * @param params
-     * @param request
-     * @param user
-     * @return
-     */
-    Map<String, Object> saveImport(Map<String, Object> params, HttpServletRequest request, User user);
-
 
     /**
      * 获取导入字段
diff --git a/src/com/engine/organization/service/impl/ExtServiceImpl.java b/src/com/engine/organization/service/impl/ExtServiceImpl.java
index 2f6c2622..e8fbd5f0 100644
--- a/src/com/engine/organization/service/impl/ExtServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ExtServiceImpl.java
@@ -15,9 +15,11 @@ import com.engine.organization.mapper.codesetting.CodeRuleMapper;
 import com.engine.organization.mapper.extend.*;
 import com.engine.organization.service.ExtService;
 import com.engine.organization.util.OrganizationAssert;
+import com.engine.organization.util.db.DBType;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import weaver.conn.RecordSet;
 import weaver.general.Util;
 import weaver.hrm.User;
 
@@ -71,7 +73,7 @@ public class ExtServiceImpl extends Service implements ExtService {
         List<String> readOnlyFieldList = Arrays.asList(readOnlyFields);
         // 组装拓展页内容
         for (ExtendInfoPO extendInfoPO : infoPOList) {
-            SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null == compExtMap ? null : compExtMap.get(extendInfoPO.getFieldName()));
+            SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null == compExtMap ? null : compExtMap.get(DBType.get(new RecordSet().getDBType()).equals(DBType.ORACLE) ? extendInfoPO.getFieldName().toUpperCase() : extendInfoPO.getFieldName()));
             item.setFieldcol(16);
             if (2 == viewAttr) {
                 if (CollectionUtils.isNotEmpty(readOnlyFieldList) && readOnlyFieldList.contains(extendInfoPO.getFieldName())) {
@@ -108,7 +110,7 @@ public class ExtServiceImpl extends Service implements ExtService {
                 item.setViewAttr(3);
                 item.setRules("required");
             }
-            if (StringUtils.isNotBlank(autoNoField) && extendInfoPO.getFieldName().equals(autoNoField)) {
+            if (StringUtils.isNotBlank(autoNoField) && extendInfoPO.getFieldName().equalsIgnoreCase(autoNoField)) {
                 // 判断是否开启自动编号
                 CodeRulePO codeRuleByType = MapperProxyFactory.getProxy(CodeRuleMapper.class).getCodeRuleByType(serialType);
                 if (null != codeRuleByType && "1".equals(codeRuleByType.getSerialEnable())) {
@@ -156,7 +158,16 @@ public class ExtServiceImpl extends Service implements ExtService {
             // 去除null 元素
             List<Map<String, Object>> maps = getExtDTMapper().listCompExtDT(tableName, id, fields);
             maps.removeIf(Objects::isNull);
-            tabinfoMap.put("datas", maps);
+            // 兼容Oracle,map的key转换为小写
+            List<Map<String, Object>> collect = maps.stream().map(item -> {
+                Map<String, Object> resultMap = new HashMap<>();
+                Set<String> keys = item.keySet();
+                for (String key : keys) {
+                    resultMap.put(key.toLowerCase(), item.get(key));
+                }
+                return resultMap;
+            }).collect(Collectors.toList());
+            tabinfoMap.put("datas", collect);
             tableMap.put("tabinfo", tabinfoMap);
             tables.add(tableMap);
         }
@@ -172,7 +183,7 @@ public class ExtServiceImpl extends Service implements ExtService {
     public List<TopTab> getTabInfo(String extendType, String tableName) {
         List<TopTab> topTabs = new ArrayList<>();
         List<ExtendInfoPO> infoPOList = getExtendInfoMapper().listFields(extendType, "", tableName, ExtendInfoOperateType.EDIT.getValue(), "1");
-        List<ExtendInfoPO> infoPOList1 = getExtendInfoMapper().listFields(extendType, "", tableName.toLowerCase().replace("ext", ""), ExtendInfoOperateType.EDIT.getValue(), "1");
+        List<ExtendInfoPO> infoPOList1 = getExtendInfoMapper().listFields(extendType, "", tableName.toUpperCase().replace("EXT", ""), ExtendInfoOperateType.EDIT.getValue(), "1");
         infoPOList.addAll(infoPOList1);
         List<Long> ids = infoPOList.stream().map(ExtendInfoPO::getExtendGroupId).collect(Collectors.toList());
 
diff --git a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
index 63ee03d1..23ffbf3d 100644
--- a/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
+++ b/src/com/engine/organization/service/impl/ImportCommonServiceImpl.java
@@ -14,7 +14,6 @@ import com.engine.organization.entity.SelectOptionParam;
 import com.engine.organization.entity.extend.param.ExtendInfoParams;
 import com.engine.organization.entity.extend.po.ExtendInfoPO;
 import com.engine.organization.entity.fieldset.param.FieldTypeTreeParam;
-import com.engine.organization.entity.hrmresource.param.HrmResourceImportParam;
 import com.engine.organization.entity.jclimport.po.CusFormFieldPO;
 import com.engine.organization.entity.jclimport.po.JclImportHistoryDetailPO;
 import com.engine.organization.entity.jclimport.po.JclImportHistoryPO;
@@ -35,9 +34,6 @@ import com.engine.organization.util.OrganizationAssert;
 import com.engine.organization.util.db.MapperProxyFactory;
 import com.engine.organization.util.excel.ExcelUtil;
 import com.engine.organization.util.relation.EcHrmRelationUtil;
-import com.engine.organization.util.saveimport.HrmResourceImportAdaptUtil;
-import com.engine.organization.util.saveimport.HrmResourceImportProcessUtil;
-import com.engine.organization.util.saveimport.SaveImportProcessUtil;
 import com.engine.organization.util.saveimport.hrmimport.HrmImportAdaptExcelE9;
 import com.engine.organization.util.saveimport.hrmimport.HrmImportProcessE9;
 import org.apache.commons.lang3.StringUtils;
@@ -52,7 +48,6 @@ import weaver.file.ImageFileManager;
 import weaver.general.BaseBean;
 import weaver.general.GCONST;
 import weaver.general.Util;
-import weaver.hrm.User;
 import weaver.hrm.definedfield.HrmFieldManager;
 import weaver.join.hrm.in.HrmResourceVo;
 import weaver.systeminfo.SystemEnv;
@@ -87,85 +82,6 @@ public class ImportCommonServiceImpl extends Service implements ImportCommonServ
         return MapperProxyFactory.getProxy(SystemDataMapper.class);
     }
 
-    @Override
-    public Map<String, Object> saveImportResource(Map<String, Object> params, HttpServletRequest request) {
-
-        Map<String, Object> returnMap = new HashMap<>();
-        try {
-            String keyField = (String) params.get("keyField");
-            switch (keyField) {
-                case "workcode":
-                    params.put("keyField", "work_code");
-                    break;
-                case "lastname":
-                    params.put("keyField", "last_name");
-                    break;
-                case "loginid":
-                    params.put("keyField", "login_id");
-                    break;
-                default:
-                    break;
-
-            }
-            /*综合考虑多数据源后，实现通过配置文件配置适配器和解析类*/
-            List<Object> lsErrorInfo = new ArrayList<>();
-            HrmResourceImportAdaptUtil importAdaptUtil = new HrmResourceImportAdaptUtil();
-            FileUploadToPath fu = new FileUploadToPath(request);
-            int language = this.user.getLanguage();
-            importAdaptUtil.setUserlanguage(language);
-            List<String> errorInfo = importAdaptUtil.creatImportMap(fu);
-            //如果读取数据和验证模板没有发生错误
-            if (errorInfo.isEmpty()) {
-                Map<String, HrmResourceImportParam> hrMap = importAdaptUtil.getHrmImportMap();
-                HrmResourceImportProcessUtil importProcessUtil = new HrmResourceImportProcessUtil();
-                importProcessUtil.init(request);
-                importProcessUtil.processMap(hrMap);
-            } else {
-                Map<String, Object> error;
-                for (String s : errorInfo) {
-                    error = new HashMap<>();
-                    error.put("message", Util.null2String(s));
-                    lsErrorInfo.add(error);
-                }
-            }
-            returnMap.put("errorInfo", lsErrorInfo);
-            returnMap.put("status", "1");
-        } catch (Exception e) {
-            returnMap.put("status", "-1");
-            returnMap.put("message", e.getMessage());
-        }
-        return returnMap;
-    }
-
-    @Override
-    public Map<String, Object> saveImport(Map<String, Object> params, HttpServletRequest request, User user) {
-        Map<String, Object> returnMap = new HashMap<>();
-        request.getSession(true).setAttribute("importBaseCreater", user);
-        try {
-            List<Object> lsErrorInfo = new ArrayList<>();
-            SaveImportProcessUtil importProcessUtil = new SaveImportProcessUtil();
-            List<String> errorInfo = importProcessUtil.importXls(request);
-            if (errorInfo != null && !errorInfo.isEmpty()) {
-                Map<String, Object> error;
-                for (String s : errorInfo) {
-                    error = new HashMap<>();
-                    error.put("message", Util.null2String(s));
-                    lsErrorInfo.add(error);
-                }
-            }
-            returnMap.put("errorInfo", lsErrorInfo);
-            returnMap.put("status", "1");
-            returnMap.put("message", SystemEnv.getHtmlLabelName(24645, user.getLanguage()));
-        } catch (Exception e) {
-            new BaseBean().writeLog("导入基础数据失败：" + e);
-            returnMap.put("status", "-1");
-            returnMap.put("message", e.getMessage());
-        }
-        returnMap.put("pid", request.getSession(true).getAttribute("importExcelPid"));
-        return returnMap;
-    }
-
-
     @Override
     public Map<String, Object> getImportFields(String importType) {
         String extendType = "";
diff --git a/src/com/engine/organization/util/saveimport/CompanyImportUtil.java b/src/com/engine/organization/util/saveimport/CompanyImportUtil.java
deleted file mode 100644
index fca164f0..00000000
--- a/src/com/engine/organization/util/saveimport/CompanyImportUtil.java
+++ /dev/null
@@ -1,522 +0,0 @@
-package com.engine.organization.util.saveimport;
-
-import com.engine.hrm.entity.RuleCodeType;
-import com.engine.hrm.util.CodeRuleManager;
-import com.engine.hrm.util.HrmTriggerUtil;
-import com.engine.hrm.util.face.HrmFaceCheckManager;
-import com.engine.organization.entity.company.po.CompPO;
-import com.engine.organization.entity.department.po.DepartmentPO;
-import com.engine.organization.mapper.comp.CompMapper;
-import com.engine.organization.mapper.department.DepartmentMapper;
-import com.engine.organization.util.db.MapperProxyFactory;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import weaver.conn.RecordSet;
-import weaver.general.BaseBean;
-import weaver.general.Util;
-import weaver.hrm.common.AjaxManager;
-import weaver.hrm.common.DbFunctionUtil;
-import weaver.hrm.company.DepartmentComInfo;
-import weaver.hrm.company.SubCompanyComInfo;
-import weaver.matrix.MatrixUtil;
-import weaver.rtx.OrganisationCom;
-import weaver.systeminfo.SysMaintenanceLog;
-import weaver.systeminfo.SystemEnv;
-
-import java.util.List;
-
-/**
- * @author:dxfeng
- * @createTime: 2022/06/30
- * @version: 1.0
- */
-public class CompanyImportUtil {
-    private final RecordSet recordSet = new RecordSet();
-    private final OrganisationCom rtxService = new OrganisationCom();   //添加到rtx
-    private int id;
-    private String subcompanyname = "";
-    private String departmentname = "";
-    private String subcompanycode = "";
-    private Integer subcompanyshoworder;
-    private String departmentcode = "";
-    private Float departmentshoworder;
-    private int userlanguage = 7;
-    private int pid;
-    private String operateType;
-    private String message = "";
-
-    private CompMapper getCompMapper() {
-        return MapperProxyFactory.getProxy(CompMapper.class);
-    }
-
-    private DepartmentMapper getDepartmentMapper() {
-        return MapperProxyFactory.getProxy(DepartmentMapper.class);
-    }
-
-    public void setPid(int pid) {
-        this.pid = pid;
-    }
-
-    public void setUserLanguage(String userlanguage) {
-        this.userlanguage = Util.getIntValue(userlanguage);
-    }
-
-    /**
-     * 校验数据有效性
-     */
-    public String valExcelData() {
-        String errorInfo = "";
-        if (Util.null2String(this.subcompanyname).length() == 0) {
-            errorInfo = SystemEnv.getHtmlLabelName(125704, userlanguage);
-            return errorInfo;
-        }
-        if (StringUtils.isNotEmpty(operateType) && operateType.equals("add")) {
-            if (!verifySubCompanyCode(subcompanycode)) return subcompanycode + "编号重复";
-            if (!verifyDeptCode(departmentcode)) return departmentcode + "编号重复";
-        }
-        return errorInfo;
-    }
-
-    /**
-     * 保存数据
-     */
-    public String save() {
-        boolean flag = false;
-        try {
-            if (StringUtils.isNotEmpty(operateType)) {
-                if (operateType.equals("add")) {
-                    int subcompanyid = 0;
-                    int departmentid;
-                    if (Util.null2String(this.subcompanyname).length() > 0) {
-                        //取分部
-                        subcompanyid = getCompanyId(this.subcompanyname);
-                    }
-                    departmentid = getDeptId(this.departmentname, subcompanyid);
-                    if (Util.null2String(this.departmentname).length() > 0) {
-                        if (departmentid != 0) flag = true;
-                    } else {
-                        if (subcompanyid != 0) flag = true;
-                    }
-                } else if (operateType.equals("update")) {
-                    int subcompanyid = updateSubCompany();
-                    if (subcompanyid == -1) return String.valueOf(flag);
-                    int deptid = updateDept(subcompanyid);
-                    if (deptid == -1) return String.valueOf(flag);
-                    flag = true;
-                }
-            }
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-        }
-
-        return String.valueOf(flag);
-    }
-
-    /**
-     * 校验分部编号是否重复
-     *
-     * @param code
-     * @return
-     */
-    private boolean verifySubCompanyCode(String code) {
-        if (StringUtils.isEmpty(code)) {
-            return true;
-        }
-        List<CompPO> compPOS = getCompMapper().listByNo(code);
-        return CollectionUtils.isEmpty(compPOS);
-    }
-
-    /**
-     * @param code
-     * @param name
-     * @param supsubcomid
-     * @return
-     */
-    private boolean verifySubCompanyCode(String code, String name, int supsubcomid) {
-        if (StringUtils.isEmpty(code)) {
-            return true;
-        }
-        // TODO 部门重复编号验证
-        RecordSet recordSet = new RecordSet();
-        String sql = "select id from HrmSubCompany where subcompanyname = ? and supsubcomid = ?";
-        recordSet.executeQuery(sql, name, supsubcomid);
-        if (recordSet.next()) {
-            String id = recordSet.getString("id");
-            sql = "select id from HrmSubCompany where subcompanycode = ? and id != ?";
-            recordSet.executeQuery(sql, code, id);
-            return recordSet.getCounts() <= 0;
-        }
-        return verifySubCompanyCode(code);
-    }
-
-    /**
-     * 校验部门编号是否重复
-     *
-     * @param code
-     * @return
-     */
-    private boolean verifyDeptCode(String code) {
-        if (StringUtils.isEmpty(code)) {
-            return true;
-        }
-        List<DepartmentPO> departmentPOS = getDepartmentMapper().listByNo(code);
-        return CollectionUtils.isEmpty(departmentPOS);
-    }
-
-    private boolean verifyDeptCode(String code, String name, int subcompanyid, int supdepid) {
-        // TODO 部门编号校验
-        if (StringUtils.isEmpty(code)) return true;
-        RecordSet recordSet = new RecordSet();
-        String sql = "select id from HrmDepartment where departmentname = ? and subcompanyid1 = ? and supdepid = ?";
-        recordSet.executeQuery(sql, name, subcompanyid, supdepid);
-        if (recordSet.next()) {
-            String id = recordSet.getString("id");
-            sql = "select id from HrmDepartment where departmentcode = ? and id != ?";
-            recordSet.executeQuery(sql, code, id);
-            return recordSet.getCounts() <= 0;
-        }
-        return verifyDeptCode(code);
-    }
-
-    private int updateDept(int subcompanyid) {
-        String[] deptNames = departmentname.split(">");
-        int currentId = 0;
-        int parentId = 0;
-        String departmentcode = "";
-        Float departmentshoworder = null;
-        for (int i = 0; i < deptNames.length; i++) {
-            if (StringUtils.isEmpty(deptNames[i])) continue;
-            String sql = "select * from HrmDepartment where subcompanyid1=" + subcompanyid + " and departmentname='" + deptNames[i].trim() + "' and supdepid=" + parentId + " and (canceled  !=1 or canceled is null)";
-            currentId = getResultSetId(sql);
-            if (currentId == 0) {
-                // 部门不存在
-                // 不存在
-                this.setMessage("，" + deptNames[i] + "部门不存在");
-                return -1;
-            }
-            if (i == deptNames.length - 1) {
-                // 最后一层级 赋值编码和顺序
-                departmentcode = this.departmentcode;
-                departmentshoworder = this.departmentshoworder;
-            }
-            if (StringUtils.isNotEmpty(departmentcode) || departmentshoworder != null) {
-                recordSet.executeQuery(sql);
-                recordSet.next();
-                if (departmentshoworder == null)
-                    departmentshoworder = Float.valueOf(Util.null2s(recordSet.getString("showorder"), "0"));
-                if (StringUtils.isEmpty(departmentcode))
-                    departmentcode = Util.null2String(recordSet.getString("departmentcode"), "");
-                if (verifyDeptCode(departmentcode, deptNames[i], subcompanyid, parentId)) {
-                    sql = "update hrmdepartment set departmentcode = ? , showorder = ? where departmentname = ? and subcompanyid1 = ? and supdepid = ? and (canceled  !=1 or canceled is null)";
-                    recordSet.executeUpdate(sql, departmentcode, departmentshoworder, deptNames[i], subcompanyid, parentId);
-                } else {
-                    setMessage("，" + departmentcode + "编号重复");
-                    return -1;
-                }
-            }
-            parentId = currentId;
-        }
-        return currentId;
-    }
-
-    private int updateSubCompany() {
-        String[] subcompanynames = subcompanyname.split(">");
-        int parentId = 0;
-        int currentId = 0;
-        String subcompanycode = "";
-        Integer subcompanyshoworder = null;
-        for (int i = 0; i < subcompanynames.length; i++) {
-            if (StringUtils.isEmpty(subcompanynames[i])) continue;
-            String sql = "select * from HrmSubCompany where subcompanyname='"
-                    + subcompanynames[i].trim() + "' and supsubcomid=" + parentId;
-            currentId = getResultSetId(sql);
-            if (currentId == 0) {
-                // 不存在
-                this.setMessage("，" + subcompanynames[i] + "分部不存在");
-                return -1;
-            }
-            if (i == subcompanynames.length - 1) {
-                // 最后一层级 赋值编码和顺序
-                subcompanycode = this.subcompanycode;
-                subcompanyshoworder = this.subcompanyshoworder;
-            }
-            // 如果编码和顺序不存在则不更新
-            if (StringUtils.isNotEmpty(subcompanycode) || subcompanyshoworder != null) {
-                recordSet.executeQuery(sql);
-                recordSet.next();
-                if (subcompanyshoworder == null)
-                    subcompanyshoworder = Integer.valueOf(Util.null2s(recordSet.getString("showorder"), "0"));
-                if (StringUtils.isEmpty(subcompanycode))
-                    subcompanycode = Util.null2String(recordSet.getString("subcompanycode"), "");
-                if (verifySubCompanyCode(subcompanycode, subcompanynames[i], parentId)) {
-                    sql = "update HrmSubCompany set subcompanycode= ? , showorder = ? where subcompanyname = ? and supsubcomid = ?";
-                    recordSet.executeUpdate(sql, subcompanycode, subcompanyshoworder, subcompanynames[i], parentId);
-                } else {
-                    setMessage("，" + subcompanycode + "编号重复");
-                    return -1;
-                }
-            }
-            parentId = currentId;
-        }
-        return currentId;
-    }
-
-    /**
-     * 根据分部名称获取分部Id，不存在就创建
-     *
-     * @param companyName 分部名称 eg：泛微广东>泛微深圳
-     */
-    public int getCompanyId(String companyName) {
-        String[] companyNames = companyName.split(">");
-        int currentId = 0;
-        int parentId = 0;
-        String sql;
-        String sqlInsert;
-        String companyCode = "";
-        Integer companyShowOrder = null;
-        for (int i = 0; i < companyNames.length; i++) {
-            if (companyNames[i] == null && companyNames[i].equals("")) {
-                continue;
-            }
-            sql = "select id from HrmSubCompany where subcompanyname='"
-                    + companyNames[i].trim() + "' and supsubcomid=" + parentId;
-
-            currentId = getResultSetId(sql);
-
-            //added by wcd 2015-02-06 [限制分部数]
-            if (currentId == 0) {
-                if (i == companyNames.length - 1) {
-                    // 最后一层级 赋值编码和顺序
-                    companyCode = this.subcompanycode;
-                    companyShowOrder = this.subcompanyshoworder;
-                    if (companyShowOrder == null) {
-                        companyShowOrder = 0;
-                    }
-                }
-                if (AjaxManager.getData("", "getLnScCount;mf").equals("true")) {
-                    // 如果编码为空 自动生成编码
-                    try {
-                        companyCode = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.SUBCOMPANY, companyCode);
-                    } catch (Exception e) {
-                        setMessage("," + e.getMessage());
-                        new BaseBean().writeLog(e);
-                        return -1;
-                    }
-                    sqlInsert = "insert into HrmSubCompany(subcompanyname,subcompanydesc,companyid,supsubcomid,subcompanycode,showorder," + DbFunctionUtil.getInsertColumnSql() + ") values('"
-                            + companyNames[i] + "','" + companyNames[i] + "',1" + "," + parentId + ",'" + companyCode + "'," + companyShowOrder + "," + DbFunctionUtil.getInsertColumnValueSql(new RecordSet().getDBType(), 1) + ")"; // 创建
-                    boolean isSuccess = execSql(sqlInsert);
-                    HrmTriggerUtil.generateSubcompanyPinyin(companyNames[i], null);
-                    currentId = getResultSetId(sql);
-                    HrmTriggerUtil.Tri_I_SubComKPICheckFlow(String.valueOf(currentId));
-                    sql = "insert into leftmenuconfig (userid,infoid,visible,viewindex,resourceid,resourcetype,locked,lockedbyid,usecustomname,customname,customname_e)  select  distinct  userid,infoid,visible,viewindex," + currentId + ",2,locked,lockedbyid,usecustomname,customname,customname_e from leftmenuconfig where resourcetype=1  and resourceid=1";
-                    execSql(sql);
-                    sql = "insert into mainmenuconfig (userid,infoid,visible,viewindex,resourceid,resourcetype,locked,lockedbyid,usecustomname,customname,customname_e)  select  distinct  userid,infoid,visible,viewindex," + currentId + ",2,locked,lockedbyid,usecustomname,customname,customname_e from mainmenuconfig where resourcetype=1  and resourceid=1";
-                    execSql(sql);
-
-                    if (isSuccess) {
-                        //同步分部数据到矩阵
-                        MatrixUtil.updateSubcompayData("" + currentId);
-                        HrmFaceCheckManager.sync(currentId + "", HrmFaceCheckManager.getOptInsert(), "hrm_import_subcompany", HrmFaceCheckManager.getOaSubcompany());
-                    }
-
-                    insertSysLog(companyNames[i]);
-                } else {
-                    currentId = -1;
-                }
-            }
-            parentId = currentId;
-            if (currentId != -1)
-                rtxService.addSubCompany(parentId);  //同步RTX
-        }
-        return currentId;
-    }
-
-    /**
-     * 获取部门id，不存在就创建
-     *
-     * @param deptNames    部门名称
-     * @param subCompanyId 所属分部id
-     */
-    public int getDeptId(String deptNames, int subCompanyId) {
-        String[] deptName = deptNames.split(">");
-        int currentId = 0;
-        int parentId = 0;
-
-        String sql;
-        String sqlInsert;
-        String departmentcode = "";
-        Float departmentshoworder = null;
-        for (int i = 0; i < deptName.length; i++) {
-            if (deptName[i] == null || deptName[i].equals("")) {
-                continue;
-            }
-            sql = "select id from HrmDepartment where subcompanyid1=" + subCompanyId + " and departmentname='" + deptName[i].trim() + "' and supdepid=" + parentId + " and (canceled  !=1 or canceled is null)";
-            currentId = getResultSetId(sql);
-
-            if (currentId == 0) {
-                if (i == deptName.length - 1) {
-                    departmentcode = this.departmentcode;
-                    departmentshoworder = this.departmentshoworder;
-                    if (departmentshoworder == null) departmentshoworder = 0.00F;
-                }
-                // 如果编码为空 自动生成编码
-                try {
-                    departmentcode = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.DEPARTMENT, String.valueOf(subCompanyId), departmentcode);
-                } catch (Exception e) {
-                    setMessage("，" + e.getMessage());
-                    new BaseBean().writeLog(e);
-                    return -1;
-                }
-                sqlInsert = "insert into HrmDepartment (departmentname,Departmentmark,subcompanyid1,supdepid,departmentcode,showorder," + DbFunctionUtil.getInsertColumnSql() + ") values('"
-                        + deptName[i] + "','" + deptName[i] + "'," + subCompanyId + "," + parentId + ",'" + departmentcode + "'," + departmentshoworder + "," + DbFunctionUtil.getInsertColumnValueSql(new RecordSet().getDBType(), 1) + ")"; // 创建
-                boolean isSuccess = execSql(sqlInsert);
-                HrmTriggerUtil.generateDepartmentPinyin(deptName[i], null);
-                currentId = getResultSetId(sql);
-                HrmTriggerUtil.Tri_I_DeptKPICheckFlow(String.valueOf(currentId));
-                if (isSuccess) {
-                    //同步部门数据到矩阵
-                    MatrixUtil.updateDepartmentData("" + currentId);
-                    HrmFaceCheckManager.sync(currentId + "", HrmFaceCheckManager.getOptInsert(), "hrm_import_deptment", HrmFaceCheckManager.getOaDepartment());
-                }
-
-                insertSysLog(deptName[i]);
-                rtxService.addDepartment(currentId);  //同步RTX
-            }
-            parentId = currentId;
-        }
-        return currentId;
-    }
-
-    /**
-     * 获得查询结果Id
-     *
-     * @param sql 查询语句
-     */
-    public int getResultSetId(String sql) {
-        int currentId = 0;
-        recordSet.execute(sql);
-        try {
-            while (recordSet.next()) {
-                currentId = recordSet.getInt("id");
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return currentId;
-    }
-
-    /**
-     * 执行插入操作
-     *
-     * @param sql
-     */
-    public boolean execSql(String sql) {
-        return recordSet.execute(sql);
-    }
-
-    public void removeCache() {
-        try {
-
-            weaver.matrix.MatrixUtil.sysSubcompayData();
-            weaver.matrix.MatrixUtil.sysDepartmentData();
-
-            SubCompanyComInfo SubCompanyComInfo = new SubCompanyComInfo();
-            SubCompanyComInfo.removeCompanyCache();
-
-            DepartmentComInfo DepartmentComInfo = new DepartmentComInfo();
-            DepartmentComInfo.removeCompanyCache();
-            //初始化应用分权
-            new weaver.hrm.appdetach.AppDetachComInfo().initSubDepAppData();
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-        }
-    }
-
-    public int getId() {
-        return id;
-    }
-
-    public void setId(int id) {
-        this.id = id;
-    }
-
-    public String getSubcompanyname() {
-        return subcompanyname;
-    }
-
-    public void setSubcompanyname(String subcompanyname) {
-        this.subcompanyname = subcompanyname;
-    }
-
-    public String getDepartmentname() {
-        return departmentname;
-    }
-
-    public void setDepartmentname(String departmentname) {
-        this.departmentname = departmentname;
-    }
-
-    public String getSubcompanycode() {
-        return subcompanycode;
-    }
-
-    public void setSubcompanycode(String subcompanycode) {
-        this.subcompanycode = subcompanycode;
-    }
-
-    public Integer getSubcompanyshoworder() {
-        return subcompanyshoworder;
-    }
-
-    public void setSubcompanyshoworder(Integer subcompanyshoworder) {
-        this.subcompanyshoworder = subcompanyshoworder;
-    }
-
-    public String getDepartmentcode() {
-        return departmentcode;
-    }
-
-    public void setDepartmentcode(String departmentcode) {
-        this.departmentcode = departmentcode;
-    }
-
-    public Float getDepartmentshoworder() {
-        return departmentshoworder;
-    }
-
-    public void setDepartmentshoworder(Float departmentshoworder) {
-        this.departmentshoworder = departmentshoworder;
-    }
-
-    public String getOperateType() {
-        return operateType;
-    }
-
-    public void setOperateType(String operateType) {
-        this.operateType = operateType;
-    }
-
-    public String getMessage() {
-        return message;
-    }
-
-    public void setMessage(String message) {
-        this.message = message;
-    }
-
-    private void insertSysLog(String name) {
-        SysMaintenanceLog syslog = new SysMaintenanceLog();
-        syslog.resetParameter();
-        syslog.setRelatedId(pid);
-        syslog.setOperateType("-1");
-        syslog.setOperateItem("12");
-        syslog.setOperateUserid(0);
-        syslog.setRelatedName(name);
-        try {
-            syslog.setSysLogInfo();
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-        }
-    }
-
-}
diff --git a/src/com/engine/organization/util/saveimport/HrmResourceImportAdaptUtil.java b/src/com/engine/organization/util/saveimport/HrmResourceImportAdaptUtil.java
deleted file mode 100644
index 5ed1383b..00000000
--- a/src/com/engine/organization/util/saveimport/HrmResourceImportAdaptUtil.java
+++ /dev/null
@@ -1,1055 +0,0 @@
-package com.engine.organization.util.saveimport;
-
-import com.engine.hrm.util.HrmWeakPasswordUtil;
-import com.engine.organization.entity.extend.po.ExtendInfoPO;
-import com.engine.organization.entity.hrmresource.param.HrmResourceImportParam;
-import com.engine.organization.mapper.extend.ExtendInfoMapper;
-import com.engine.organization.util.db.MapperProxyFactory;
-import org.apache.poi.hssf.usermodel.HSSFDateUtil;
-import org.apache.poi.ss.usermodel.*;
-import weaver.common.DateUtil;
-import weaver.file.FileUploadToPath;
-import weaver.file.ImageFileManager;
-import weaver.general.BaseBean;
-import weaver.general.Util;
-import weaver.hrm.settings.ChgPasswdReminder;
-import weaver.hrm.settings.RemindSettings;
-import weaver.systeminfo.SystemEnv;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.nio.charset.StandardCharsets;
-import java.text.DecimalFormat;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Pattern;
-
-/**
- * @author:dxfeng
- * @createTime: 2022/06/27
- * @version: 1.0
- */
-public class HrmResourceImportAdaptUtil {
-
-    private String fileName;
-
-    private String importType;
-
-    private Sheet sheet;
-
-    private int sheetCount = 0;
-
-    private final List<String> errorInfo = new ArrayList<>();
-
-    private String[] temFields;
-
-    //标准模板字段
-    private String tempField = "分部,部门," +
-            "编号,姓名,登录名,密码,安全级别,性别," +
-            "岗位,职务,职务类型,职称,职级," +
-            "职责描述,直接上级,助理,状态," +
-            "办公室,办公地点,办公电话,移动电话,其他电话," +
-            "传真,电子邮件,系统语言,出生日期,民族," +
-            "籍贯,户口,身份证号码," +
-            "婚姻状况,政治面貌,入团日期,入党日期," +
-            "工会会员,学历,学位,健康状况,身高," +
-            "体重,用工性质,合同开始日期,合同结束日期,试用期结束日期,现居住地,家庭联系方式,暂住证号码," +
-            "入职日期,参加工作日期," +
-            "公积金帐户,账号类型,主账号,身高(cm),体重(kg),工资账号户名,工资银行,工资账号," +
-            "办公室电话,显示顺序,人员密级";
-
-    //存放必填列下标数组，包含自定义字段中的必填列
-    private String[] requiredFields;
-
-    //必填列标准模板或字段下标
-    private final String requiredField = "0,1,3,8,9,10,18";
-
-    //标准导入字段数组
-    private String[] voFields;
-
-    //标准导入字段
-    private String voField = "company_id,department_id," +
-            "work_code,last_name,login_id,pass_word,sec_level,sex," +
-            "job_title,job_activity,job_group_id,job_call,job_level," +
-            "job_activity_desc,manager_id,assistant_id,status," +
-            "workroom,location_id,telephone,mobile,mobile_call," +
-            "fax,email,system_language,birthday,folk," +
-            "native_place,reg_resident_place,certificate_num," +
-            "marital_status,policy,be_member_date,be_party_date," +
-            "islabouunion,education_level,degree,health_info,height," +
-            "weight,use_kind,start_date,end_date,probation_end_date," +
-            "resident_place,home_address,temp_resident_number," +
-            "company_start_date,work_start_date," +
-            "accum_fund_account,account_type,belong_to,height,weight,account_name,bank_id,account_id," +
-            "telephone,show_order,classification";
-
-    //基本信息字段数组最后下标
-    private int baseFieldsLastIndex = 0;
-
-    //基础自定义信息字段数组最后下标
-    private int baseFieldsLastIndex1 = 0;
-
-
-    // 重复性验证标准数据库字段下标 例如
-    private int keyFieldIndex = 2;
-
-    //  重复性验证excel字段下标
-    private int keyColumn = -1;
-
-    // 用于做重复性验证，重复性与行键值对，<编号,4>,<编号,5>
-    private final Map<String, String> repeatKeyMap = new HashMap<>();
-
-    private int certificateNumIndex = 29;
-    private int certificateNumColumn = -1;
-    private final Map<Object, String> certificateNums = new HashMap<>();
-
-    Map<String, Map<String, String>> checkInfos = new HashMap<>();
-
-    private final String[] checkKeys = new String[]{"login_id", "work_code"};
-
-    private int accountTypeIndex = 50;
-    private int accountTypeColumn = -1;
-
-    // 用于存贮HrmResource所有方法参数内容格式为<methodNmae,Method对象>,通过fieldsMaping中的对应关系可以找到方法和参数
-    private final Map<String, Method> parameterTypes = new HashMap<>();
-
-    // HrmResourceVo povo对象属性类型，用于反射赋值
-    private final Map<String, String> fieldTypes = new HashMap<>();
-
-    //excel字段数组下标与标准字段数组下标对应关系<excelFieldIndex,voFieldIndex>
-    private final Map<Integer, Integer> fieldsMap = new HashMap<>();
-
-    //人员map集合
-    private final LinkedHashMap<String, HrmResourceImportParam> hrmResourceMap = new LinkedHashMap<>();
-
-    Map<Integer, String> cusFieldValMap = new HashMap<>();     //个人信心自定义字段与工作信息自定字段数据验证条件
-
-    private int userlanguage = 7;   //登录语言
-
-    //弱密码禁止保存：false-允许保存弱密码、true-不允许保存弱密码
-    private boolean weakPasswordDisable = false;
-    //判断弱密码
-    private HrmWeakPasswordUtil hrmWeakPasswordUtil;
-
-    /**
-     * map集合创建类
-     *
-     * @param fu 上传参数
-     * @return List
-     */
-    public List<String> creatImportMap(FileUploadToPath fu) {
-        try {
-            new BaseBean().writeLog("lxr2018>>>language2=" + userlanguage);
-            // 初始化数据
-            initDataSource(fu);
-
-            if (!errorInfo.isEmpty()) {
-                deleteFile();
-                return errorInfo;
-            }
-            //初始化模板字段
-            initTempFields();
-
-            // 模板验证
-            valExcelTemp();
-
-            if (!errorInfo.isEmpty()) {
-                deleteFile();
-                return errorInfo;
-            }
-
-            // 读取数据并验证
-            readExcel();
-
-            deleteFile();
-            return errorInfo;
-        } catch (NegativeArraySizeException e) {
-            //目前尚不清楚，这种异常的产生原因
-            errorInfo.add(SystemEnv.getHtmlLabelName(83615, userlanguage));
-            new BaseBean().writeLog(e);
-            return errorInfo;
-        } catch (Exception e) {
-            //Excel导入错误，请阅读注意事项并检查模板文件
-            errorInfo.add(SystemEnv.getHtmlLabelName(83617, userlanguage));
-            new BaseBean().writeLog(e);
-            return errorInfo;
-        }
-
-    }
-
-    private void deleteFile() {
-        new Thread(() -> {
-            try {
-                Thread.sleep(30 * 1000);
-                ImageFileManager.deletePdfImageFile(Util.getIntValue(fileName));
-            } catch (InterruptedException e) {
-                new BaseBean().writeLog(e);
-            }
-        }).start();
-    }
-
-    /**
-     * 获取人员map
-     */
-    public Map<String, HrmResourceImportParam> getHrmImportMap() {
-        return hrmResourceMap;
-    }
-
-    /**
-     * 获取上传文件，初始化参数
-     *
-     * @param fu
-     */
-    public void initDataSource(FileUploadToPath fu) {
-        this.importType = fu.getParameter("importType");
-
-        // 重复性验证字段
-        String keyField = fu.getParameter("keyField");
-
-        voFields = voField.split(",");
-
-        for (int i = 0; i < voFields.length; i++) {
-            if (keyField.equals(voFields[i])) {
-                keyFieldIndex = i;
-            }
-            // 身份证号
-            if ("certificate_num".equalsIgnoreCase(voFields[i])) {
-                certificateNumIndex = i;
-            }
-            // 账号类型
-            if ("account_type".equalsIgnoreCase(voFields[i])) {
-                accountTypeIndex = i;
-            }
-            if (keyFieldIndex != 2 && certificateNumIndex != 29) break;
-        }
-        try {
-            this.fileName = fu.getParameter("excelfile");
-            ImageFileManager manager = new ImageFileManager();
-            manager.getImageFileInfoById(Util.getIntValue(this.fileName));
-            Workbook workbook = WorkbookFactory.create(manager.getInputStream());
-            this.sheetCount = workbook.getNumberOfSheets();
-            this.sheet = workbook.getSheetAt(this.sheetCount > 1 ? 1 : 0);
-        } catch (FileNotFoundException ignored) {
-        } catch (IOException e) {
-            errorInfo.add(SystemEnv.getHtmlLabelName(83618, userlanguage));                    //上传文件不是excel文件
-            new BaseBean().writeLog(e);
-        } catch (IndexOutOfBoundsException e) {
-            errorInfo.add(SystemEnv.getHtmlLabelName(83619, userlanguage));
-            new BaseBean().writeLog(e);
-        }
-
-        ChgPasswdReminder reminder = new ChgPasswdReminder();
-        RemindSettings settings = reminder.getRemindSettings();
-        //判断是否启用【弱密码禁止保存】
-        this.weakPasswordDisable = Util.null2String(settings.getWeakPasswordDisable()).equals("1");
-        try {
-            //判断是否为弱密码
-            hrmWeakPasswordUtil = new HrmWeakPasswordUtil();
-        } catch (Exception e) {
-            errorInfo.add("加载弱密码集合出错");
-            new BaseBean().writeLog(e);
-        }
-    }
-
-    /**
-     * 验证模板格式
-     */
-    public void valExcelTemp() {
-        int rowIndex = (this.sheetCount > 1 ? 1 : 0);
-        Row row;
-        Cell cell;
-        String cellValue;
-        List<String> fieldList = new ArrayList<>();
-        try {
-            row = sheet.getRow(rowIndex);
-            for (int i = 0; i < row.getLastCellNum(); i++) {
-                boolean flag = false;
-                cell = row.getCell((short) i);
-                if (cell != null) {
-                    cellValue = getCellValue(cell).trim();
-                    for (int k = 0; k < temFields.length; k++) {
-                        if (cellValue.equals(temFields[k])) {
-                            fieldsMap.put(i, k);
-                            fieldList.add(cellValue);
-                            if (keyFieldIndex == k)  //如果重复性验证标准数据库字段下标与标准excel模板下标相等，则找到对应的excel验证列
-                                keyColumn = i;
-                            if (certificateNumIndex == k) {
-                                certificateNumColumn = i;
-                            }
-                            if (accountTypeIndex == k) {
-                                accountTypeColumn = i;
-                            }
-                            flag = true;
-                            break;
-                        }
-                    }
-                    if (!flag)
-                        errorInfo.add(getCellPosition(i, (rowIndex + 1)) + "[" + cellValue + "]" + " 不是模板中字段，请检查是否有误");      //不是模板中字段，请检查是否有误
-                    if (importType.equals("add")) {  //如果是插入操作才验证固定列
-                        if (i == 0 && !cellValue.equals(temFields[0]))
-                            errorInfo.add("分部必须在第" + (rowIndex + 1) + "行第1列");   //【分部】固定列
-                        if (i == 1 && !cellValue.equals(temFields[1]))
-                            errorInfo.add("部门必须在第" + (rowIndex + 1) + "行第2列");    // 【部门】固定列
-                    } else {
-                        //如果是更新，并且存在分部部门列，就规定分部、部门在第1、2列
-                        if (cellValue.equals(temFields[0]) && !temFields[1].equals(getCellValue(rowIndex, 1).trim()))
-                            errorInfo.add("更新时有分部则后一列必须为部门，且第" + (rowIndex + 1) + "行第1列为分部，第2列为部门");   //【分部】固定列
-                        else if (cellValue.equals(temFields[0]) && i != 0)
-                            errorInfo.add("分部必须在第" + (rowIndex + 1) + "行第1列");   //【分部】固定列
-
-
-                        if (cellValue.equals(temFields[1]) && !temFields[0].equals(getCellValue(rowIndex, 0).trim()))
-                            errorInfo.add("更新时有部门则前一列必须为分部，且第" + (rowIndex + 1) + "行第1列为分部，第2列为部门");   //【分部】固定列
-                        else if (cellValue.equals(temFields[1]) && i != 1)
-                            errorInfo.add("部门必须在第" + (rowIndex + 1) + "行第2列");   //【部门】固定列
-
-                    }
-                }
-            }
-            if (keyColumn == -1)
-                errorInfo.add("[" + temFields[keyFieldIndex] + "]" + " 您所选的重复性验证字段不在模板中");  //您所选的重复性验证字段不在模板中
-
-            if (importType.equals("add")) {  //如果是插入操作才验证必填列
-                for (String field : requiredFields) {
-                    boolean flag = false;
-                    for (String s : fieldList) {
-                        if (temFields[Integer.parseInt(field)].equals(s)) {
-                            flag = true;
-                            break;
-                        }
-                    }
-                    if (!flag)
-                        errorInfo.add("[" + temFields[Integer.parseInt(field)] + "]" + " 为必填字段");  //必填字段
-                }
-            }
-        } catch (IllegalArgumentException e) {
-            errorInfo.add(SystemEnv.getHtmlLabelName(83617, userlanguage));             //   excel模板有误时
-            new BaseBean().writeLog(e);
-        }
-    }
-
-    /**
-     * 初始化反射所需要的方法和字段Map，parameterTypes，fieldTypes
-     */
-    public void initReflectParam() {
-        Class<HrmResourceImportParam> hrmResourceImportParamClass = HrmResourceImportParam.class;
-        Method[] hrmResourceMethods = hrmResourceImportParamClass.getDeclaredMethods();
-
-        for (Method hrmResourceMethod : hrmResourceMethods) {
-            parameterTypes.put(hrmResourceMethod.getName(),
-                    hrmResourceMethod);
-        }
-
-        Field[] hrmResourceFields = hrmResourceImportParamClass.getDeclaredFields();
-
-        for (Field hrmResourceField : hrmResourceFields) {
-            Class<?> fieldTypeClass = hrmResourceField.getType();
-            fieldTypes.put(hrmResourceField.getName(), fieldTypeClass
-                    .getName());
-        }
-    }
-
-    /**
-     * 读取excel数据
-     */
-    public void readExcel() {
-
-        initReflectParam(); // 初始化反射参数
-
-        boolean flag; // 标记验证是否通过
-        Row row;
-        Cell cell;
-        int rowNum; // 行号
-        int cellNum; // 列号
-        int firstRow = (this.sheetCount > 1 ? 2 : 1);
-        String keyValue = "";
-        int lastRow = sheet.getLastRowNum();
-        String subCompany = "";
-        String department = "";
-        String cellValue;
-        int fieldIndex;
-        HrmResourceImportParam importParam;
-
-        for (int i = firstRow; i <= lastRow; i++) {
-            flag = true;
-            row = sheet.getRow(i);
-            if (row == null) {
-                errorInfo.add(SystemEnv.getHtmlLabelName(15323, userlanguage) + " " + (i + 1) + " " + SystemEnv.getHtmlLabelName(83622, userlanguage));
-                continue;
-            }
-            rowNum = row.getRowNum();
-            StringBuilder baseFieldsValue = new StringBuilder();
-            StringBuilder baseFields = new StringBuilder();
-            if (repeatValidate(row, rowNum)) { // 重复性验证
-                continue;
-            }
-
-            importParam = new HrmResourceImportParam();
-
-            for (int cellIndex = 0; cellIndex < fieldsMap.size(); cellIndex++) {
-
-                cell = row.getCell((short) cellIndex);
-
-                cellNum = cellIndex;
-
-
-                fieldIndex = fieldsMap.get(cellNum);
-
-                cellValue = getCellValue(cell).trim();
-
-                if (valExcelDataFormate(rowNum, cellNum, cellValue)) {
-                    if (fieldIndex == keyFieldIndex) { // 验证通过，如果当前单元格为重复性验证单元格，则把值赋给keyValue
-                        keyValue = cellValue;
-                    }
-                } else {
-                    flag = false;
-                }
-
-                if (flag) { // 为true则，设置值，否则不需要
-
-                    if (fieldIndex == 0 && getCellValue(1, cellNum).equals("分部")) { // 对于excel分部为空则取上面分部读取的值
-                        if (cellValue.equals(""))
-                            cellValue = subCompany;
-                        else
-                            subCompany = cellValue;
-                    }
-
-                    if (fieldIndex == 1 && getCellValue(1, cellNum).equals("部门")) { // 对于excel部门为空则取上面部门读取的值
-                        if (cellValue.equals(""))
-                            cellValue = department;
-                        else
-                            department = cellValue;
-                    }
-
-                    if (fieldIndex <= baseFieldsLastIndex) {
-                        setHrmResourceValue(fieldIndex, cellValue, importParam, null);
-                    }
-
-                    if (fieldIndex > baseFieldsLastIndex && fieldIndex <= baseFieldsLastIndex1) {
-                        baseFields.append(",").append(voFields[fieldIndex]);
-                        if (cellValue.equals(""))
-                            cellValue = "?";
-                        baseFieldsValue.append(";").append(cellValue);
-                        setHrmResourceValue(0, baseFields.substring(1), importParam, "baseFields");
-                        setHrmResourceValue(0, baseFieldsValue.substring(1), importParam, "baseFieldsValue");
-                    }
-
-                }
-            }
-            String currentDate = DateUtil.getCurrentDate();
-            if (Util.null2String(importParam.getWork_start_date()).length() > 0 && Util.null2String(importParam.getWork_year()).length() == 0) {//计算工龄
-                int day = DateUtil.dayDiff(importParam.getWork_start_date(), currentDate);
-                DecimalFormat df = new DecimalFormat("0.0");
-                importParam.setWork_year(df.format(day / 365.0));
-            }
-
-            if (Util.null2String(importParam.getCompany_start_date()).length() > 0 && Util.null2String(importParam.getCompany_work_year()).length() == 0) {//计算司令
-                int day = DateUtil.dayDiff(importParam.getWork_start_date(), currentDate);
-                DecimalFormat df = new DecimalFormat("0.0");
-                importParam.setCompany_work_year(df.format(day / 365.0));
-            }
-
-            repeatKeyMap.put(keyValue, "" + (i + 1)); // 用于重复性验证
-            if (importParam.getAccount_type() != null && !"".equals(importParam.getAccount_type())) {
-                if ("主账号".equals(importParam.getAccount_type())) {
-                    certificateNums.put(importParam.getCertificate_num(), String.valueOf(i + 1));
-                }
-            } else {
-                certificateNums.put(importParam.getCertificate_num(), String.valueOf(i + 1));
-            }
-
-            if (checkInfo(importParam, rowNum)) { // 重复性验证
-                continue;
-            }
-
-            //新增账号、工号唯一性校验
-            for (String key : checkKeys) {
-                Map<String, String> checkInfo = checkInfos.get(key);
-                if (checkInfo == null) {
-                    checkInfo = new HashMap<>();
-                    checkInfos.put(key, checkInfo);
-                } else {
-                    checkInfo = checkInfos.get(key);
-                }
-                String val = "";
-                switch (key) {
-                    case "login_id":
-                        val = importParam.getLogin_id();
-                        break;
-                    case "work_code":
-                        val = importParam.getWork_code();
-                        break;
-                    case "certificate_num":
-                        val = importParam.getCertificate_num();
-                        break;
-                }
-                checkInfo.put(val, String.valueOf(i + 1));
-                checkInfos.put(key, checkInfo);
-            }
-
-            if (flag) {
-                hrmResourceMap.put(keyValue, importParam);
-            }
-        }
-    }
-
-    /**
-     * 重复性验证，读取唯一性cell值，然后从HrmResourceMap中查找是否存在
-     *
-     * @param row    行
-     * @param rowNum 行下标
-     */
-    public boolean repeatValidate(Row row, int rowNum) {
-        if (certificateNumColumn == -1)
-            return false;
-        String certificateNum = getCellValue(row.getCell((short) certificateNumColumn)).trim();
-        String accounttype = getCellValue(row.getCell((short) accountTypeColumn)).trim();
-        String key = getCellValue(row.getCell((short) keyColumn)).trim();
-        if (voFields[fieldsMap.get(keyColumn)].equals(""))
-            key = getCellValue(row.getCell((short) 0)).trim() + ">" + getCellValue(row.getCell((short) 1)).trim() + "_" + key;
-        String repeatRow = repeatKeyMap.get(key);
-        String cnRow = certificateNums.get(certificateNum);
-        if (repeatRow != null) {
-            errorInfo.add((rowNum + 1) + "," + repeatRow + " 行重复");  //重复 num_5,6 行重复
-            return true;
-        } else if (cnRow != null && certificateNum.length() > 0) {
-            if ("次账号".equalsIgnoreCase(accounttype)) {
-                return false;
-            } else {
-                errorInfo.add((rowNum + 1) + "," + cnRow + " " + SystemEnv.getHtmlLabelName(83623, userlanguage));
-                return true;
-            }
-        } else {
-            return false;
-        }
-    }
-
-    private boolean checkInfo(HrmResourceImportParam importParam, int rowNum) {
-        //新增账号、工号唯一性校验
-        for (String key : checkKeys) {
-            Map<String, String> checkInfo = checkInfos.get(key);
-            if (checkInfo != null && !checkInfo.isEmpty()) {
-                String val = "";
-                String errorMsg = "";
-                switch (key) {
-                    case "login_id":
-                        val = Util.null2String(importParam.getLogin_id()).trim();
-                        errorMsg = SystemEnv.getHtmlLabelName(520127, userlanguage);
-                        break;
-                    case "work_code":
-                        val = Util.null2String(importParam.getWork_code()).trim();
-                        errorMsg = SystemEnv.getHtmlLabelName(520128, userlanguage);
-                        break;
-                    case "certificate_num":
-                        val = Util.null2String(importParam.getCertificate_num()).trim();
-                        errorMsg = SystemEnv.getHtmlLabelName(83623, userlanguage);
-                        break;
-                }
-                String cnRow = Util.null2String(checkInfo.get(val));
-                if (cnRow.length() > 0 && val.length() > 0) {
-                    errorInfo.add((rowNum + 1) + "," + cnRow + errorMsg);
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 验证数据格式，必填列是否为空
-     *
-     * @param rowNum    行号
-     * @param cellNum   列号
-     * @param cellValue 单元格值
-     */
-    public boolean valExcelDataFormate(int rowNum, int cellNum, String cellValue) {
-
-        boolean flag = true;
-        String msg;
-        int fieldIndex = fieldsMap.get(cellNum);
-        String fieldName = voFields[fieldIndex];
-
-        // 人员信息第1行(模板第2行)的分部和部门为必填
-
-        if ((rowNum == 1 || rowNum == 2) && fieldName.equals("company_id") && getCellValue(1, cellNum).equals("分部") && cellValue.equals("")) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";           //【分部】为必填
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83626, userlanguage));
-            return false;
-        }
-
-        if ((rowNum == 1 || rowNum == 2) && fieldName.equals("department_id") && getCellValue(1, cellNum).equals("部门") && cellValue.equals("")) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";           //【部门】为必填
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83626, userlanguage));
-            return false;
-
-        }
-        //【分部】不为空则【部门】为必填
-        if (fieldName.equals("department_id") && cellValue.equals("")) {
-            if (!getCellValue(rowNum, cellNum - 1).equals("")) { //分部不为空
-                msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83626, userlanguage));
-                return false;
-            }
-        }
-
-        // 姓名
-        if (fieldName.equals("last_name") && cellValue.equals("")) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";          //【姓名】为必填
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83626, userlanguage));
-            return false;
-        }
-
-        // 岗位
-        if (fieldName.equals("job_title") && cellValue.equals("")) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";          //【岗位】为必填
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83626, userlanguage));
-            return false;
-        }
-
-        if (fieldName.equals("job_activity") && cellValue.equals("")) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";          //【职务】为必填
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83626, userlanguage));
-            return false;
-        }
-
-        if (fieldName.equals("job_group_id") && cellValue.equals("")) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";         //【职务类型】为必填
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83626, userlanguage));
-            return false;
-        }
-
-        // 办公地点
-        if (fieldName.equals("location_id") && cellValue.equals("")) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";         //【办公地点】为必填
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83626, userlanguage));
-            return false;
-        }
-
-        //自定义字段为必填设置时
-        if (fieldIndex > baseFieldsLastIndex && requiredField.contains(String.valueOf(fieldIndex))) {
-            if (cellValue.equals("")) {
-                msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83626, userlanguage));
-                return false;
-            }
-        }
-
-        //基本信息、个人信息、工作信息自定义验证
-        if (fieldIndex > baseFieldsLastIndex && !cellValue.equals("")) {
-            //自定义信息字段不能包含‘?’问号
-            if (cellValue.contains("?") && getStrLength(cellValue) == 1) {
-                msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83627, userlanguage));
-                return false;
-            }
-            String valType = cusFieldValMap.get(fieldIndex);
-            if (valType != null)
-                if (valType.equals("isInt")) {
-                    if (!isInteger(cellValue)) {
-                        msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                        errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83628, userlanguage));
-                        return false;
-                    }
-                    if (getStrLength(cellValue) > 18 && (Integer.MAX_VALUE < Double.parseDouble(cellValue) || Double.parseDouble(cellValue) < Integer.MIN_VALUE)) {
-                        msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                        errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83629, userlanguage) + Integer.MAX_VALUE + SystemEnv.getHtmlLabelName(15508, userlanguage) + Integer.MIN_VALUE);
-                        return false;
-                    }
-
-                } else if (valType.equals("isDouble")) {
-                    if (isDecimal(cellValue)) {
-                        msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                        errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83637, userlanguage));
-                        return false;
-                    }
-                    if (getStrLength(cellValue) > 18) {
-                        flag = false;
-                        msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                        errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83639, userlanguage));
-                    }
-                } else if (valType.equals("isDate")) {
-                    if (getStrLength(cellValue) != 10) {
-                        flag = false;
-                        msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                        errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83640, userlanguage));
-                    }
-
-                } else if (isInteger(valType) && getStrLength(cellValue) > Integer.parseInt(valType)) {
-                    msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                    errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83641, userlanguage) + valType + SystemEnv.getHtmlLabelName(20075, userlanguage));
-                    return false;
-                } else if (valType.equals("isCheck") && !cellValue.equals("0") && !cellValue.equals("1")) {
-                    msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                    errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83644, userlanguage));
-                    return false;
-                }
-        }
-
-        //安全级别、职级整数格式验证、大于0验证
-        if ((fieldName.equals("sec_level") || fieldName.equals("job_level")) && !cellValue.equals("")) {
-            if (fieldName.equals("sec_level")) {
-                //安全级别不能大于999
-                if (Util.getIntValue(cellValue) > 999) {
-                    msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                    errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(515522, userlanguage));
-                    return false;
-                }
-                //安全级别不能小于-999
-                if (Util.getIntValue(cellValue) < -999) {
-                    msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                    errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(515523, userlanguage));
-                    return false;
-                }
-            } else {
-                if (!isInteger(cellValue)) {
-                    msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                    errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83645, userlanguage));
-                    return false;
-                }
-                if (Integer.parseInt(cellValue) < 0 || Integer.parseInt(cellValue) > 1000) {
-                    msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                    errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83648, userlanguage));
-                    return false;
-                }
-            }
-        }
-        //身高、体重数据格式验证、大于0验证
-        if ((fieldName.equals("height") || fieldName.equals("weight")) && !cellValue.equals("")) {
-            if (isDecimal(cellValue)) {
-                msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83650, userlanguage));
-                return false;
-            }
-            if (Double.parseDouble(cellValue) < 0 || Double.parseDouble(cellValue) > 1000) {
-                msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83648, userlanguage));
-                return false;
-            }
-        }
-
-
-        //长度为200个字符的标准字段
-        if ((fieldName.equals("job_title") || fieldName.equals("job_activity") || fieldName.equals("job_group_id") ||
-                fieldName.equals("location_id") || fieldName.equals("job_activity_desc") || fieldName.equals("reg_resident_place")) && !cellValue.equals("") && getStrLength(cellValue) > 200) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83666, userlanguage) + "200" + SystemEnv.getHtmlLabelName(20075, userlanguage));
-            return false;
-        }
-
-        //长度为100的标准字段
-        if ((fieldName.equals("login_id") || fieldName.equals("pass_word") || fieldName.equals("home_address") || fieldName.equals("native_place")) && !cellValue.equals("") && getStrLength(cellValue) > 100) {
-
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";         //自定义日期字段长度验证
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83666, userlanguage) + "100" + SystemEnv.getHtmlLabelName(20075, userlanguage));
-            return false;
-
-        }
-        //长度为60的标准字段
-        if ((fieldName.equals("last_name") || fieldName.equals("pass_word") || fieldName.equals("telephone") || fieldName.equals("mobile") || fieldName.equals("mobile_call")
-                || fieldName.equals("email") || fieldName.equals("workroom") || fieldName.equals("work_code") || fieldName.equals("fax")
-                || fieldName.equals("certificate_num") || fieldName.equals("job_call") || fieldName.equals("temp_resident_number"))
-                && !cellValue.equals("") && getStrLength(cellValue) > 60) {
-
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83666, userlanguage) + "60" + SystemEnv.getHtmlLabelName(20075, userlanguage));
-            return false;
-
-        }
-
-        //长度为30个字符的标准字段
-        if ((fieldName.equals("degree") || fieldName.equals("policy")) && !cellValue.equals("") && getStrLength(cellValue) > 30) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83666, userlanguage) + "30" + SystemEnv.getHtmlLabelName(20075, userlanguage));
-            return false;
-        }
-
-        //长度为10个字符的标准字段
-        if ((fieldName.equals("birthday") || fieldName.equals("be_member_date") || fieldName.equals("be_party_date") ||
-                fieldName.equals("start_date") || fieldName.equals("end_date") || fieldName.equals("probation_end_date")) && !cellValue.equals("") && getStrLength(cellValue) > 10) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83666, userlanguage) + "10" + SystemEnv.getHtmlLabelName(20075, userlanguage));
-            return false;
-        }
-
-        //分部各级长度验证
-        if (fieldName.equals("company_id") && !cellValue.equals("")) {
-            String[] subcompanyname = cellValue.split(">");
-            for (String s : subcompanyname) {
-                if (getStrLength(s) > 200)
-                    flag = false;
-            }
-            if (!flag) {
-                msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83667, userlanguage));
-                return false;
-            }
-        }
-
-        //部门各级长度验证
-        if (fieldName.equals("department_id") && !cellValue.equals("")) {
-            String[] departmentname = cellValue.split(">");
-            for (String s : departmentname) {
-                if (getStrLength(s) > 200)
-                    flag = false;
-            }
-            if (!flag) {
-                msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83668, userlanguage));
-                return false;
-            }
-        }
-
-        //当启用【弱密码禁止保存】时，弱密码导入失败，失败信息为“密码安全性过弱”
-        if ("pass_word".equalsIgnoreCase(fieldName)) {
-            if (weakPasswordDisable && hrmWeakPasswordUtil.isWeakPsd(cellValue)) {
-                msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";
-                errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(515436, userlanguage));
-                return flag;
-            }
-        }
-
-        if (fieldIndex == keyFieldIndex && cellValue.equals("")) {
-            msg = getCellPosition(cellNum, rowNum + 1) + "[" + temFields[fieldIndex] + "]";      // 重复性验证字段不在模板中
-            errorInfo.add(msg + " " + SystemEnv.getHtmlLabelName(83626, userlanguage));
-            return false;
-        }
-
-        return flag;
-    }
-
-    /**
-     * 通过反射为对象赋值
-     *
-     * @param cellNum     列号
-     * @param cellValue   单元格值
-     * @param importParam 需要赋值的HrmResource
-     */
-    public void setHrmResourceValue(int cellNum, String cellValue,
-                                    HrmResourceImportParam importParam, String field) {
-        if (field == null) {
-            String excelField = voFields[cellNum];
-            String methodName = "set" + excelField.substring(0, 1).toUpperCase()
-                    + excelField.substring(1);
-            Method method = parameterTypes.get(methodName);
-            try {
-                String fieldType = fieldTypes.get(excelField);
-                if (fieldType.equals("java.lang.String"))
-                    method.invoke(importParam, cellValue);
-                else if (fieldType.equals("java.lang.Integer")) {
-                    if (!cellValue.equals("")) {
-                        method.invoke(importParam, Integer.parseInt(cellValue));
-                    }
-                } else if (fieldType.equals("java.lang.Float") && !cellValue.equals(""))
-                    method.invoke(importParam, Float.parseFloat(cellValue));
-                else if (fieldType.equals("java.lang.Short") && !cellValue.equals("")) {
-                    method.invoke(importParam, Short.parseShort(cellValue));
-                }
-            } catch (Exception e) {
-                new BaseBean().writeLog(e);
-            }
-        } else {
-            String methodName = "set" + field.substring(0, 1).toUpperCase()
-                    + field.substring(1);
-            Method method = parameterTypes.get(methodName);
-            try {
-                method.invoke(importParam, cellValue);
-            } catch (Exception e) {
-                new BaseBean().writeLog(e);
-            }
-        }
-    }
-
-    /**
-     * excel单元格位置转换
-     *
-     * @param cellIndex 列号
-     * @param rowNum    行号
-     */
-    public String getCellPosition(int cellIndex, int rowNum) {
-
-        int count = cellIndex / 26;
-        String cellChar = String.valueOf((char) (cellIndex % 26 + 65));
-        String cellPosition;
-
-        if (count != 0)
-            cellPosition = (char) ((count - 1) + 65) + cellChar;
-        else
-            cellPosition = cellChar;
-        cellPosition += rowNum;
-        return cellPosition;
-    }
-
-    /**
-     * 初始化模板字段
-     */
-    public void initTempFields() {
-        new BaseBean().writeLog("initTempFields");
-
-        temFields = tempField.split(",");
-
-        baseFieldsLastIndex = temFields.length - 1;
-
-        int requiredFieldIndex = baseFieldsLastIndex;
-
-        /*基本信息信息字段*/
-        StringBuilder baseField = new StringBuilder();
-        StringBuilder baseFieldLabel = new StringBuilder();
-        String fieldHtmlType;
-        List<ExtendInfoPO> infoPOList = MapperProxyFactory.getProxy(ExtendInfoMapper.class).listFields("4", "", "JCL_ORG_HRMRESOURCE", "","");
-        for (ExtendInfoPO extendInfoPO : infoPOList) {
-            fieldHtmlType = extendInfoPO.getControlType().toString();
-            if (fieldHtmlType.equals("1") || fieldHtmlType.equals("2") || fieldHtmlType.equals("3")
-                    || fieldHtmlType.equals("4") || fieldHtmlType.equals("5")) {
-                baseField.append(",field").append(extendInfoPO.getId());
-                baseFieldLabel.append(",").append(extendInfoPO.getFieldNameDesc());
-                requiredFieldIndex++;
-                //验证条件
-                //1为html文本类型
-                switch (fieldHtmlType) {
-                    case "1":
-                        switch (extendInfoPO.getBrowserType()) {
-                            case "1"://1为文本数据类型
-                                String fielddbtype = extendInfoPO.getFieldType();
-                                fielddbtype = fielddbtype.substring(fielddbtype.indexOf("(") + 1, fielddbtype.lastIndexOf(")")); //截取字符设置的长度
-                                cusFieldValMap.put(requiredFieldIndex, fielddbtype);
-                                break;
-                            case "2":// 2为整数数据类型
-                                cusFieldValMap.put(requiredFieldIndex, "isInt");
-                                break;
-                            case "3":// 3为浮点数数据类型
-                                cusFieldValMap.put(requiredFieldIndex, "isDouble");
-                                break;
-                            default:
-                                cusFieldValMap.put(requiredFieldIndex, "");
-                                break;
-                        }
-                        break;
-                    case "4"://4 为check框
-                        cusFieldValMap.put(requiredFieldIndex, "isCheck");
-                        break;
-                    case "3":
-                        if (extendInfoPO.getBrowserType().equals("2")) {
-                            cusFieldValMap.put(requiredFieldIndex, "isDate");
-                        } else if (extendInfoPO.getBrowserType().equals("19")) {
-                            cusFieldValMap.put(requiredFieldIndex, "isTime");
-                        } else {
-                            cusFieldValMap.put(requiredFieldIndex, "isBrowser");
-                        }
-                        break;
-                    case "5":
-                        cusFieldValMap.put(requiredFieldIndex, "isSelect");
-                        break;
-                }
-            }
-        }
-        voField = voField + baseField;
-        tempField = tempField + baseFieldLabel;
-        temFields = tempField.split(",");
-        baseFieldsLastIndex1 = temFields.length - 1;
-        requiredFields = requiredField.split(",");
-    }
-
-    /**
-     * 获取excel单元格值
-     *
-     * @param cell 要读取的单元格对象
-     */
-    public String getCellValue(Cell cell) {
-        String cellValue = "";
-        if (cell == null)
-            return "";
-        switch (cell.getCellType()) {
-            case BOOLEAN:                                  //得到Boolean对象的方法
-                cellValue = String.valueOf(cell.getBooleanCellValue());
-                break;
-            case NUMERIC:
-                cellValue = SaveImportProcessUtil.getString(HSSFDateUtil.isCellDateFormatted(cell), cell.getDateCellValue(), cell.getNumericCellValue());
-                break;
-            case FORMULA:                               //读取公式
-                cellValue = cell.getCellFormula();
-                break;
-            case STRING:                              //读取String
-                cellValue = cell.getStringCellValue();
-                if (cellValue == null)
-                    cellValue = "";
-                Date d = validDate(cellValue);
-                if (d != null)
-                    cellValue = new SimpleDateFormat("yyyy-MM-dd").format(d);
-                break;
-        }
-        cellValue = Util.toHtmlForHrm(cellValue);
-        return cellValue;
-    }
-
-    private Date validDate(String str) {
-        Date d = null;
-        SimpleDateFormat fmt1 = new SimpleDateFormat("yyyy-MM-dd");
-        fmt1.setLenient(false);
-        SimpleDateFormat fmt2 = new SimpleDateFormat("yyyy/MM/dd");
-        fmt2.setLenient(false);
-        try {
-            d = fmt1.parse(str);
-        } catch (Exception ignored) {
-        }
-        try {
-            d = fmt2.parse(str);
-        } catch (Exception ignored) {
-
-        }
-        return d;
-    }
-
-    /**
-     * 获取指定行、列的单元格值
-     *
-     * @param cellNum
-     * @return
-     */
-    public String getCellValue(int rowNum, int cellNum) {
-        Row row = sheet.getRow(rowNum);
-        Cell cell = row.getCell((short) cellNum);
-        String cellValue = getCellValue(cell);
-        cellValue = Util.toHtmlForHrm(cellValue);
-        return cellValue;
-    }
-
-    //浮点数判断
-    public boolean isDecimal(String str) {
-        if (str == null || "".equals(str))
-            return true;
-        Pattern pattern = Pattern.compile("\\d*(\\.?)\\d*");
-        return !pattern.matcher(str).matches();
-    }
-
-    //整数判断
-    public boolean isInteger(String str) {
-        if (str == null)
-            return false;
-        Pattern pattern = Pattern.compile("\\d+");
-        return pattern.matcher(str).matches();
-    }
-
-    /**
-     * 获取字符串字节长度 由于java中中英字符都按1个字符，而数据库中汉字按两个字符计算
-     *
-     * @param str
-     * @return
-     */
-    public int getStrLength(String str) {
-        try {
-            if (str == null)
-                return 0;
-            else
-                return new String(str.getBytes("gb2312"), StandardCharsets.ISO_8859_1).length();
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-            return 0;
-        }
-    }
-
-    public void setUserlanguage(int userlanguage) {
-        this.userlanguage = userlanguage;
-    }
-}
diff --git a/src/com/engine/organization/util/saveimport/HrmResourceImportProcessUtil.java b/src/com/engine/organization/util/saveimport/HrmResourceImportProcessUtil.java
deleted file mode 100644
index dfa0e849..00000000
--- a/src/com/engine/organization/util/saveimport/HrmResourceImportProcessUtil.java
+++ /dev/null
@@ -1,1743 +0,0 @@
-package com.engine.organization.util.saveimport;
-
-import com.alibaba.fastjson.JSONObject;
-import com.engine.common.util.ParamUtil;
-import com.engine.common.util.ServiceUtil;
-import com.engine.hrm.entity.RuleCodeType;
-import com.engine.hrm.service.ImportLogService;
-import com.engine.hrm.service.impl.ImportLogServiceImpl;
-import com.engine.hrm.util.CodeRuleManager;
-import com.engine.hrm.util.HrmWeakPasswordUtil;
-import com.engine.hrm.util.face.HrmFaceCheckManager;
-import com.engine.hrm.util.face.ValidateFieldManager;
-import com.engine.hrm.util.face.bean.CheckItemBean;
-import com.engine.organization.entity.company.po.CompPO;
-import com.engine.organization.entity.department.po.DepartmentPO;
-import com.engine.organization.entity.extend.param.ExtendInfoParams;
-import com.engine.organization.entity.hrmresource.param.HrmResourceImportParam;
-import com.engine.organization.entity.hrmresource.po.HrmResourcePO;
-import com.engine.organization.entity.job.po.JobPO;
-import com.engine.organization.entity.postion.po.PostInfoPO;
-import com.engine.organization.entity.postion.po.PostPO;
-import com.engine.organization.mapper.comp.CompMapper;
-import com.engine.organization.mapper.department.DepartmentMapper;
-import com.engine.organization.mapper.extend.ExtMapper;
-import com.engine.organization.mapper.hrmresource.HrmResourceMapper;
-import com.engine.organization.mapper.hrmresource.SystemDataMapper;
-import com.engine.organization.mapper.job.JobMapper;
-import com.engine.organization.mapper.post.PostInfoMapper;
-import com.engine.organization.mapper.post.PostMapper;
-import com.engine.organization.util.PageInfoSortUtil;
-import com.engine.organization.util.db.MapperProxyFactory;
-import ln.LN;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import weaver.common.DateUtil;
-import weaver.common.StringUtil;
-import weaver.conn.RecordSet;
-import weaver.general.BaseBean;
-import weaver.general.PasswordUtil;
-import weaver.general.Util;
-import weaver.hrm.User;
-import weaver.hrm.definedfield.HrmFieldManager;
-import weaver.hrm.passwordprotection.manager.HrmResourceManager;
-import weaver.hrm.settings.ChgPasswdReminder;
-import weaver.hrm.settings.RemindSettings;
-import weaver.join.hrm.in.ImportLog;
-import weaver.join.hrm.in.processImpl.HrmTlevelManager;
-import weaver.systeminfo.SystemEnv;
-
-import javax.servlet.http.HttpServletRequest;
-import java.lang.reflect.Field;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author:dxfeng
- * @createTime: 2022/06/30
- * @version: 1.0
- */
-public class HrmResourceImportProcessUtil {
-
-
-    private final Map<String, Integer> keyMap = new HashMap<>();           //看数据库是否有重复，将数据库现有的数据查出<id,workcode_lastname>
-
-    private final Map<String, Integer> certificateNums = new HashMap<>();//已存在的身份证
-
-    Map<String, Map<String, String>> checkInfos = new HashMap<>();
-
-    private final String[] checkKeys = new String[]{"login_id", "work_code"};
-
-    private final String date = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
-
-    private final int userlanguage = 7;   //登录语言
-
-    LN license = new LN();           //license
-
-    String keyField = "";
-    String operateType = "";
-
-    private int scCount = 0;
-
-    private HrmResourceImportParam hrmResourceImportParam = null;
-
-    private String multilanguage;
-
-    private Map<String, Integer> sysLanguage = null;
-
-    private Map<String, Integer> jobcallMap = null;
-    private Map<String, Integer> locationMap = null;
-    private Map<String, Integer> usekindMap = null;
-    private Map<String, Integer> educationlevelMap = null;
-
-    private int cnLanguageId = 7;
-
-    private User user;
-    private int pId = 0;
-    private int rowNum = 0;
-
-    //判断弱密码
-    private HrmWeakPasswordUtil hrmWeakPasswordUtil;
-
-
-    private HrmResourceMapper getResourceMapper() {
-        return MapperProxyFactory.getProxy(HrmResourceMapper.class);
-    }
-
-    private CompMapper getCompMapper() {
-        return MapperProxyFactory.getProxy(CompMapper.class);
-    }
-
-    private DepartmentMapper getDepartmentMapper() {
-        return MapperProxyFactory.getProxy(DepartmentMapper.class);
-    }
-
-    private JobMapper getJobMapper() {
-        return MapperProxyFactory.getProxy(JobMapper.class);
-    }
-
-    private PostInfoMapper getPostInfoMapper() {
-        return MapperProxyFactory.getProxy(PostInfoMapper.class);
-    }
-
-    private PostMapper getPostMapper() {
-        return MapperProxyFactory.getProxy(PostMapper.class);
-
-    }
-
-    private SystemDataMapper getSystemDataMapper() {
-        return MapperProxyFactory.getProxy(SystemDataMapper.class);
-    }
-
-    private ExtMapper getExtMapper() {
-        return MapperProxyFactory.getProxy(ExtMapper.class);
-    }
-
-    public void setUser(User user) {
-        this.user = user;
-    }
-
-    public void init(HttpServletRequest request) {
-        Map<String, Object> retmap;
-        try {
-            this.user = (User) request.getSession(true).getAttribute("weaver_user@bean");
-            this.keyField = Util.null2String(request.getParameter("keyField"));
-            switch (keyField) {
-                case "workcode":
-                    keyField = "work_code";
-                    break;
-                case "lastname":
-                    keyField = "last_name";
-                    break;
-                case "loginid":
-                    keyField = "login_id";
-                    break;
-                default:
-                    break;
-
-            }
-            this.operateType = Util.null2String(request.getParameter("operateType"));
-
-            ImportLogService importLogService = ServiceUtil.getService(ImportLogServiceImpl.class, user);
-            Map<String, Object> params = ParamUtil.request2Map(request);
-            params.put("operateType", this.operateType);
-            retmap = importLogService.saveImportLog(params, request, user);
-            if (Util.null2String(retmap.get("status")).equals("1")) {
-                this.pId = Util.getIntValue(Util.null2String(retmap.get("pId")));
-                request.getSession(true).setAttribute("hrmresourcePId", this.pId);
-            }
-
-            final int F_Y = 0;
-            final int F_N = 1;
-            LN license = new LN();
-            license.InLicense();
-            int type = StringUtil.parseToInt(license.getScType(), F_N);
-            scCount = StringUtil.parseToInt(license.getScCount(), 0);
-            scCount = type == F_Y ? (Math.max(scCount, 0)) : 0;
-
-            JSONObject sysLanguageByLicense = getSystemDataMapper().getSysLanguageByLicense();
-            if (null != sysLanguageByLicense) {
-                multilanguage = sysLanguageByLicense.getString("multilanguage");
-                cnLanguageId = sysLanguageByLicense.getInteger("cnLanguageId");
-            }
-
-
-            sysLanguage = new HashMap<>();
-            List<JSONObject> sysLanguageByActivables = getSystemDataMapper().getSysLanguageByActivable();
-            for (JSONObject sysLanguageByActivable : sysLanguageByActivables) {
-                sysLanguage.put(sysLanguageByActivable.getString("language"), sysLanguageByActivable.getInteger("id"));
-            }
-            educationlevelMap = new HashMap<>();
-            List<JSONObject> hrmEducationLevelDatas = getSystemDataMapper().getHrmEducationLevelData();
-            for (JSONObject hrmEducationLevelData : hrmEducationLevelDatas) {
-                educationlevelMap.put(hrmEducationLevelData.getString("name"), hrmEducationLevelData.getInteger("id"));
-            }
-
-            jobcallMap = new HashMap<>();
-            List<JSONObject> hrmJobCallDatas = getSystemDataMapper().getHrmJobCallData();
-            for (JSONObject hrmJobCallData : hrmJobCallDatas) {
-                jobcallMap.put(hrmJobCallData.getString("name"), hrmJobCallData.getInteger("id"));
-            }
-
-            locationMap = new HashMap<>();
-            List<JSONObject> hrmLocations = getSystemDataMapper().getHrmLocationsByCountryId();
-            for (JSONObject hrmLocation : hrmLocations) {
-                locationMap.put(hrmLocation.getString("locationname"), hrmLocation.getInteger("id"));
-            }
-
-            usekindMap = new HashMap<>();
-            List<JSONObject> hrmUseKindDatas = getSystemDataMapper().getHrmUseKindData();
-            for (JSONObject hrmUseKindData : hrmUseKindDatas) {
-                usekindMap.put(hrmUseKindData.getString("name"), hrmUseKindData.getInteger("id"));
-            }
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-        }
-    }
-
-    /**
-     * 对人员数据进行解析，并添加到数据库
-     *
-     * @param hrMap 人员数据Map集合
-     */
-    public void processMap(Map<String, HrmResourceImportParam> hrMap) {//增加同步锁，防止同时多次调用
-        List<ImportLog> resultList = new ArrayList<>();          //导入结果
-        RecordSet recordSet = new RecordSet();
-        ImportLogService importLogService = ServiceUtil.getService(ImportLogServiceImpl.class, user);
-        try {
-            String subCompanyName = "";      //分部名称
-            String departmentName = "";      //部门名称
-            long companyId = 0L;           // 分部Id
-            long departmentId = 0L;            // 部门id
-            String key;                   // workcode_lastname 组合
-            getKeyMap(keyField);             //获取重复性验证字段Map
-            Long id;
-
-            Set<String> keySet = hrMap.keySet();
-            Object[] keyArray = keySet.toArray();
-
-            Class<HrmResourcePO> resourcePOClass = HrmResourcePO.class;
-            Class<HrmResourceImportParam> importParamClass = HrmResourceImportParam.class;
-
-            String field = "work_code,login_id,last_name,sex,account_type,belong_to,company_id,department_id,job_activity,job_title,job_call,job_level,job_group_id,job_activity_desc,status,system_language,resource_image_id,messager_url,location_id,manager_id,assistant_id,mobile,telephone,mobile_call,fax,email,workroom,pass_word,sec_level,birthday,folk,native_place,reg_resident_place,certificate_num,marital_status,policy,be_member_date,be_party_date,islabouunion,degree,health_info,education_level,height,weight,use_kind,start_date,end_date,probation_end_date,resident_place,home_address,temp_resident_number,company_start_date,work_start_date,accum_fund_account,account_name,bank_id,account_id,show_order,classification,company_work_year,work_year";
-
-            String[] fields = field.split(",");
-
-            int createrid = 1; // 创建者id
-            // 最后修改者id
-            if (user != null) {
-                createrid = user.getUID();
-            }
-
-            ChgPasswdReminder reminder = new ChgPasswdReminder();
-            RemindSettings settings = reminder.getRemindSettings();
-            //判断是否启用【启用初始密码】
-            //是否启用初始密码：false-不启用初始密码、true-启用初始密码
-            boolean defaultPasswordEnable = Util.null2String(settings.getDefaultPasswordEnable()).equals("1");
-            //初始密码
-            //初始密码
-            String defaultPassword = Util.null2String(settings.getDefaultPassword());
-            //判断是否启用【弱密码禁止保存】
-            //弱密码禁止保存：false-允许保存弱密码、true-不允许保存弱密码
-            boolean weakPasswordDisable = Util.null2String(settings.getWeakPasswordDisable()).equals("1");
-            try {
-                //判断是否为弱密码
-                hrmWeakPasswordUtil = new HrmWeakPasswordUtil();
-            } catch (Exception e) {
-                new BaseBean().writeLog(e);
-            }
-
-            String obj;
-            HrmResourcePO hrmResourcePO;
-            for (Object o : keyArray) {
-                obj = o.toString();
-                hrmResourceImportParam = hrMap.get(obj);
-                key = obj;
-                hrmResourcePO = new HrmResourcePO();
-                this.rowNum++;
-                try {  // 异常处理
-
-                    if (operateType.equals("add")) {
-                        if (keyMap.get(key) != null) {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83520, userlanguage)));
-                            continue;
-                        }
-
-                        if (this.checkInfo(hrmResourceImportParam, resultList)) {
-                            continue;
-                        }
-                        if (hrmResourceImportParam.getAccount_type() == null || "".equalsIgnoreCase(Util.null2String(hrmResourceImportParam.getAccount_type()))) {
-                            if (StringUtil.isNotNull(hrmResourceImportParam.getCertificate_num()) && certificateNums.get(StringUtil.vString(hrmResourceImportParam.getCertificate_num())) != null) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83521, userlanguage)));
-                                continue;
-                            }
-                        } else {
-                            if (hrmResourceImportParam.getAccount_type() != null && !"".equals(hrmResourceImportParam.getAccount_type())) {
-                                if ("主账号".equals(hrmResourceImportParam.getAccount_type())) {
-                                    if (StringUtil.isNotNull(hrmResourceImportParam.getCertificate_num()) && certificateNums.get(StringUtil.vString(hrmResourceImportParam.getCertificate_num())) != null) {
-                                        resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83521, userlanguage)));
-                                        continue;
-                                    }
-                                }
-                            }
-                        }
-
-                        //添加人员信息 license 人员上限判断
-
-                        if (keyMap.get(key) == null && StringUtils.isNotBlank(hrmResourceImportParam.getLogin_id()) && ("主账号".equals(hrmResourceImportParam.getAccount_type()) || StringUtils.isBlank(hrmResourceImportParam.getAccount_type())) && "正式,试用,临时,试用延期".contains(Util.null2String(hrmResourceImportParam.getStatus()))) {
-                            license.reloadLicenseInfo();
-                            if (license.CkHrmnum() >= 0) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83522, userlanguage)));
-                                continue;
-                            }
-                        }
-                        // 分部Id
-                        String subCompanyNames = hrmResourceImportParam.getCompany_id() + "";
-                        String tempSubCompanyName = "";
-                        if (subCompanyNames != null) {
-                            if (!subCompanyNames.equals(subCompanyName)) {
-                                tempSubCompanyName = subCompanyName;
-                                subCompanyName = subCompanyNames;
-                                companyId = getSubCompanyId(subCompanyName);
-                            }
-                            if (companyId == -9) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getErrorMsgName(56, userlanguage)));
-                                continue;
-                            }
-                            if (companyId == -2) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(126274, userlanguage)));
-                                continue;
-                            }
-                            if (companyId == -1) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83524, userlanguage)));
-                                continue;
-                            }
-                            if (StringUtil.parseToInt(license.getConcurrentFlag(), 0) != 1) {
-                                if (new HrmResourceManager().noMore(String.valueOf(companyId))) {
-                                    resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83525, userlanguage)));
-                                    continue;
-                                }
-                            }
-                            companyId = 0 == companyId ? null : companyId;
-                            hrmResourcePO.setCompanyId(companyId);
-                        } else {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83526, userlanguage)));
-                            continue;
-                        }
-
-                        // 部门id
-                        String departmentNames = hrmResourceImportParam.getDepartment_id();
-                        if (departmentNames != null) {
-                            if (!subCompanyNames.equals(tempSubCompanyName) || !departmentNames.equals(departmentName)) {
-                                departmentName = departmentNames;
-                                departmentId = getDeptId(departmentName, companyId);
-                            }
-                            if (departmentId == -2) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(126275, userlanguage)));
-                                continue;
-                            }
-                            hrmResourcePO.setDepartmentId(departmentId);
-                        } else {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83527, userlanguage)));
-                            continue;
-                        }
-
-                        if (hrmResourceImportParam.getLast_name() == null) {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83529, userlanguage)));
-                            continue;
-                        }
-
-                        //主账号id-sunjsh
-                        if (hrmResourceImportParam.getAccount_type() != null && !"".equals(hrmResourceImportParam.getAccount_type())) {
-                            if ("主账号".equals(hrmResourceImportParam.getAccount_type())) {
-                                hrmResourcePO.setBelongTo(-1L);
-                                hrmResourcePO.setAccountType(0);
-                            } else if ("次账号".equals(hrmResourceImportParam.getAccount_type())) {
-                                if (hrmResourceImportParam.getBelong_to() != null && !"".equals(hrmResourceImportParam.getBelong_to().trim())) {
-                                    long belongTo = getBelongId(hrmResourceImportParam.getBelong_to(), keyField);
-                                    hrmResourcePO.setBelongTo(belongTo);
-                                    if (!hrmResourceImportParam.getBelong_to().equals("") && belongTo == 0) {
-                                        resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(131279, userlanguage)));
-                                        continue;
-                                    } else {
-                                        hrmResourcePO.setAccountType(1);
-                                    }
-                                } else {
-                                    resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(131279, userlanguage)));
-                                    continue;
-                                }
-                            } else {
-                                hrmResourcePO.setBelongTo(-1L);
-                                hrmResourcePO.setAccountType(0);
-                            }
-                        } else if (hrmResourceImportParam.getBelong_to() != null && !"".equals(hrmResourceImportParam.getBelong_to().trim())) {
-                            long belongTo = getBelongId(hrmResourceImportParam.getBelong_to(), keyField);
-                            hrmResourcePO.setBelongTo(belongTo);
-                            if (!hrmResourceImportParam.getBelong_to().equals("") && belongTo == 0) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(131279, userlanguage)));
-                                continue;
-                            } else {
-                                hrmResourcePO.setAccountType(1);
-                            }
-                        } else {
-                            hrmResourcePO.setBelongTo(-1L);
-                            hrmResourcePO.setAccountType(0);
-                        }
-
-                        // 岗位id
-                        if (hrmResourceImportParam.getJob_title() != null && hrmResourceImportParam.getJob_activity() != null && hrmResourceImportParam.getJob_group_id() != null) {
-                            String jobNames = hrmResourceImportParam.getJob_title();
-                            hrmResourcePO.setJobTitle(getJobTitles(companyId, departmentId, jobNames));
-                        } else {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83531, userlanguage)));
-                            continue;
-                        }
-
-                        //上级id
-                        if (hrmResourceImportParam.getManager_id() != null) {
-                            int managerid = getManagerId(hrmResourceImportParam.getManager_id(), keyField);
-                            hrmResourcePO.setManagerId(0 == managerid ? null : managerid);
-                            //如果vo.getManagerid()有值，但manageid未找到，说明填写有误
-                            if (!hrmResourceImportParam.getManager_id().equals("") && managerid == 0) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83532, userlanguage)));
-                                continue;
-                            }
-                        } else {
-                            hrmResourcePO.setManagerId(null);
-                        }
-
-                        // 助理id
-                        if (hrmResourceImportParam.getAssistant_id() != null) {
-                            int assistantId = getAssistantId(hrmResourceImportParam.getAssistant_id(), keyField);
-                            hrmResourcePO.setAssistantId(assistantId);
-                            if (!hrmResourceImportParam.getAssistant_id().equals("") && assistantId == 0) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(24678, userlanguage)));
-                                continue;
-                            }
-                        }
-
-                        // 办公地点
-                        if (hrmResourceImportParam.getLocation_id() != null) {
-                            hrmResourcePO.setLocationId(getLocationId(hrmResourceImportParam.getLocation_id()));
-                        } else {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(83533, userlanguage)));
-                            continue;
-                        }
-
-                        //邮箱-sunjsh
-                        if (hrmResourceImportParam.getEmail() != null) {
-                            if (!"".equals(hrmResourceImportParam.getEmail().trim()) && hrmResourceImportParam.getEmail().contains("*")) {
-                                hrmResourceImportParam.setEmail(null);
-                            } else if ("".equals(hrmResourceImportParam.getEmail().trim())) {
-                                hrmResourcePO.setEmail("");
-                            } else {
-                                Pattern pattern = Pattern.compile("^([a-zA-Z\\d_\\-.]+)@((\\[\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.)|(([a-zA-Z\\d\\-]+\\.)+))([a-zA-Z]{2,4}|\\d{1,3})(]?)$");
-                                Matcher matcher = pattern.matcher(hrmResourceImportParam.getEmail());
-                                if (!matcher.matches()) {
-                                    resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(24570, userlanguage)));
-                                    continue;
-                                } else {
-                                    hrmResourcePO.setEmail(hrmResourceImportParam.getEmail());
-                                }
-                            }
-                        }
-
-                        //mobile-sunjsh
-                        if (hrmResourceImportParam.getMobile() != null) {
-                            if ("".equals(hrmResourceImportParam.getMobile().trim()) || (!"".equals(hrmResourceImportParam.getMobile().trim()) && hrmResourceImportParam.getMobile().contains("*")))
-                                hrmResourceImportParam.setMobile(null);
-                        } else hrmResourcePO.setMobile("");
-
-                        //工资银行-sunjsh
-                        if (hrmResourceImportParam.getBank_id() != null && !"".equals(hrmResourceImportParam.getBank_id())) {
-                            org.json.JSONObject jsonObject = new org.json.JSONObject();
-                            jsonObject.put("fieldid", 0);
-                            jsonObject.put("fieldhtmltype", 3);
-                            jsonObject.put("type", 284);
-                            jsonObject.put("dmlurl", "");
-                            jsonObject.put("fieldvalue", hrmResourceImportParam.getBank_id());
-
-                            String fieldvalue = HrmFieldManager.getReallyFieldvalue(jsonObject);
-                            if (!"".equals(fieldvalue)) {
-                                hrmResourcePO.setBankId(new Integer(fieldvalue));
-                            } else {
-                                hrmResourcePO.setBankId(this.getBankId(hrmResourceImportParam.getBank_id()));
-                            }
-                        }
-
-                        //sunjsh-入职日期
-                        if (hrmResourceImportParam.getCompany_start_date() != null && !"".equals(hrmResourceImportParam.getCompany_start_date())) {
-                            hrmResourcePO.setCompanyStartDate(hrmResourceImportParam.getCompany_start_date());
-                        }
-
-                        //sunjsh-参加工作日期
-                        if (hrmResourceImportParam.getWork_start_date() != null && !"".equals(hrmResourceImportParam.getWork_start_date())) {
-                            hrmResourcePO.setWorkStartDate(hrmResourceImportParam.getWork_start_date());
-                        }
-                        // 性别，为空或其他情况统一为0(男)
-                        String sex = "女".equals(hrmResourceImportParam.getSex()) ? "1" : "0";
-                        hrmResourcePO.setSex(sex);
-
-                        // 职称
-                        if (hrmResourceImportParam.getJob_call() != null) {
-                            int jobcall = getJobCall(hrmResourceImportParam.getJob_call());
-                            hrmResourcePO.setJobCall(jobcall);
-                        }
-                        // 系统语言，默认简体中文
-                        if (hrmResourceImportParam.getSystem_language() != null) {
-                            int systemlanguage = getSystemLanguage(hrmResourceImportParam.getSystem_language());
-
-                            if (systemlanguage == -1) {    //只能选择简体中文|Englisth|繁体中文
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(518929, userlanguage)));
-                                continue;
-                            }
-                            if (systemlanguage == 0) {    //系统不支持多语言
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(84810, userlanguage)));
-                                continue;
-                            }
-                            hrmResourcePO.setSystemLanguage(systemlanguage);
-                        } else {
-                            hrmResourcePO.setSystemLanguage(7);
-                        }
-
-                        // 婚姻状况，如果不是以下选项，则默认为未婚
-                        String maritalStatus = "已婚".equals(hrmResourceImportParam.getMarital_status()) ? "1" : "离异".equals(hrmResourceImportParam.getMarital_status()) ? "2" : "0";
-                        hrmResourcePO.setMaritalStatus(maritalStatus);
-
-                        // 员工状态
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getStatus()))) {
-                            int status = getStatus(hrmResourceImportParam.getStatus());
-                            hrmResourcePO.setStatus(status);
-                        } else {
-                            hrmResourcePO.setStatus(1);
-                        }
-
-                        // 人员密级
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getClassification()))) {
-                            int classification = getClassification(hrmResourceImportParam.getClassification());
-                            hrmResourcePO.setClassification(classification);
-                        }
-                        // 学历
-                        if (hrmResourceImportParam.getEducation_level() != null) {
-                            int educationLevel = getEducationLevel(hrmResourceImportParam.getEducation_level());
-                            hrmResourcePO.setEducationLevel(educationLevel);
-                        }
-
-                        // 工会会员,默认为是
-                        String islabouunion = "是".equals(hrmResourceImportParam.getIslabouunion()) ? "1" : "0";
-                        hrmResourcePO.setIslabouunion(islabouunion);
-
-                        // 健康状况
-                        if (hrmResourceImportParam.getHealth_info() != null) {
-                            String healthinfo = getHealthInfo(hrmResourceImportParam.getHealth_info());
-                            hrmResourcePO.setHealthInfo(healthinfo);
-                        } else {
-                            hrmResourcePO.setHealthInfo("0");
-                        }
-
-                        //安全级别不能大于999
-                        if (Util.getIntValue(hrmResourceImportParam.getSec_level(), 0) > 999) {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(515522, userlanguage)));
-                            continue;
-                        }
-                        //安全级别不能小于-999
-                        if (Util.getIntValue(hrmResourceImportParam.getSec_level(), 0) < -999) {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(515523, userlanguage)));
-                            continue;
-                        }
-                        //安全级别必须是数字
-                        if (!Util.null2String(hrmResourceImportParam.getSec_level()).equals("")) {
-                            if (Util.getIntValue(hrmResourceImportParam.getSec_level(), -1000) == -1000) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", "安全级别必须是数字"));
-                                continue;
-                            } else {
-                                hrmResourcePO.setSecLevel(Util.getIntValue(hrmResourceImportParam.getSec_level()));
-                            }
-                        } else {
-                            //安全级别为空时取缓存类中的安全级别
-                            hrmResourcePO.setSecLevel(0);
-                        }
-
-                        //职级
-                        if (isInteger(hrmResourceImportParam.getJob_level())) {
-                            // TODO 职级
-                            Long jobLevel = hrmResourceImportParam.getJob_level().equals("") ? 0 : Long.parseLong(hrmResourceImportParam.getJob_level());
-                            hrmResourcePO.setJobLevel(jobLevel);
-                        } else {
-                            hrmResourcePO.setJobLevel(0L);
-                        }
-                        // 职务分类
-                        Long jobGroupId = null;
-                        if (hrmResourceImportParam.getJob_group_id() != null) {
-                            List<PostPO> postPOS = getPostMapper().listByName(hrmResourceImportParam.getJob_group_id());
-                            if (CollectionUtils.isNotEmpty(postPOS)) {
-                                jobGroupId = postPOS.get(0).getId();
-                            } else {
-                                PostPO postPO = PostPO.builder()
-                                        .postName(hrmResourceImportParam.getJob_group_id())
-                                        .creator((long) user.getUID())
-                                        .deleteType(0)
-                                        .createTime(new Date())
-                                        .build();
-                                getPostMapper().insertIgnoreNull(postPO);
-                                jobGroupId = postPO.getId();
-                            }
-                            hrmResourcePO.setJobGroupId(jobGroupId);
-                        }
-
-                        // 职务
-                        if (hrmResourceImportParam.getJob_activity() != null) {
-                            if (null == jobGroupId) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", "职务导入错误，未找到对应职务类别"));
-                                continue;
-                            }
-                            PostInfoPO postInfoPO = getPostInfoMapper().getPostInfoByNameAndPostId(hrmResourceImportParam.getJob_activity(), jobGroupId);
-                            if (null == postInfoPO) {
-                                postInfoPO = PostInfoPO.builder()
-                                        .postInfoNo(hrmResourceImportParam.getJob_activity())
-                                        .postInfoName(hrmResourceImportParam.getJob_activity())
-                                        .postId(jobGroupId)
-                                        .creator((long) user.getUID())
-                                        .deleteType(0)
-                                        .createTime(new Date())
-                                        .build();
-                                getPostInfoMapper().insertIgnoreNull(postInfoPO);
-                            }
-                            hrmResourcePO.setJobActivity(postInfoPO.getId());
-                        }
-
-                        //用工性质
-                        if (hrmResourceImportParam.getUse_kind() != null) {
-                            int useKind = getUseKind(hrmResourceImportParam.getUse_kind());
-                            hrmResourcePO.setUseKind(useKind);
-                        } else {
-                            hrmResourcePO.setUseKind(0);
-                        }
-
-
-                        // 手机 办公电话
-                        CheckItemBean mobileBean = new CheckItemBean("mobile", hrmResourceImportParam.getMobile());
-                        ValidateFieldManager.validate(mobileBean);
-                        if (!mobileBean.isPass()) {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", mobileBean.getCheckMsg()));
-                            continue;
-                        }
-                        CheckItemBean telephoneBean = new CheckItemBean("telephone", hrmResourceImportParam.getTelephone());
-                        ValidateFieldManager.validate(telephoneBean);
-                        if (!telephoneBean.isPass()) {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", telephoneBean.getCheckMsg()));
-                            continue;
-                        }
-
-
-                        ////id，非自动增长
-                        Long maxId = getResourceMapper().getMaxId();
-                        id = null == maxId ? 1 : maxId + 1;
-                        hrmResourcePO.setId(id);
-
-
-                        //密码 加密
-                        String password_tmp = Util.null2String(hrmResourceImportParam.getPass_word()).trim();
-                        if ("".equals(password_tmp)) {
-                            password_tmp = "1";
-                            //人员导入文件中，将密码这一列删除或者密码这一列存在，但是不填写都默认为初始密码
-                            if (defaultPasswordEnable) {
-                                if (!defaultPassword.equals("")) {
-                                    if (weakPasswordDisable && this.hrmWeakPasswordUtil.isWeakPsd(defaultPassword)) {
-                                        resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(515436, userlanguage)));
-                                        continue;
-                                    } else {
-                                        password_tmp = defaultPassword;
-                                    }
-                                } else {
-                                    resultList.add(createLog(hrmResourceImportParam, "创建", "失败", SystemEnv.getHtmlLabelName(516347, userlanguage)));
-                                    continue;
-                                }
-                            }
-                        }
-                        // 显示顺序
-                        if (null != hrmResourceImportParam.getShow_order()) {
-                            hrmResourcePO.setShowOrder(hrmResourceImportParam.getShow_order());
-                        } else {
-                            hrmResourcePO.setShowOrder(id.intValue());
-                        }
-
-                        String[] encrypts = PasswordUtil.encrypt(password_tmp);
-                        HrmFaceCheckManager.setUserPassowrd(id + "", password_tmp);
-
-                        String password = encrypts[0];
-                        hrmResourcePO.setPassWord(password);
-
-                        boolean flag = true;
-
-                        /*添加人员信息*/
-                        Map<String, Object> resourceParams = new HashMap<>();
-
-                        String workCode = hrmResourceImportParam.getWork_code();
-                        workCode = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.USER, workCode);
-                        hrmResourceImportParam.setWork_code(workCode);
-
-                        for (String s : fields) {
-                            Field resourcePOClassField = resourcePOClass.getDeclaredField(PageInfoSortUtil.underlineToHump(s));
-                            Field paramClassDeclaredField = importParamClass.getDeclaredField(s);
-
-                            String hrmFieldType = resourcePOClassField.getType().getName();
-                            String voFieldType = paramClassDeclaredField.getType().getName();
-
-                            resourcePOClassField.setAccessible(true);
-                            paramClassDeclaredField.setAccessible(true);
-
-                            //首先取hrm对象中的数据，没有去vo中的
-                            boolean isNumber = hrmFieldType.endsWith("Long") || hrmFieldType.endsWith("Integer") || hrmFieldType.endsWith("Short") || hrmFieldType.endsWith("Float");
-                            if (resourcePOClassField.get(hrmResourcePO) != null) {
-                                if (hrmFieldType.endsWith("String")) {
-                                    resourceParams.put(s, resourcePOClassField.get(hrmResourcePO));
-                                } else if (isNumber) {
-                                    String insertValueStr = Util.null2String(resourcePOClassField.get(hrmResourcePO));
-                                    if ("".equals(insertValueStr) && recordSet.getDBType().equalsIgnoreCase("postgresql")) {
-                                        resourceParams.put(s, null);
-                                    } else {
-                                        resourceParams.put(s, resourcePOClassField.get(hrmResourcePO));
-                                    }
-                                }
-                            } else if (paramClassDeclaredField.get(hrmResourceImportParam) != null) {
-                                if (voFieldType.endsWith("String")) {
-                                    if (Util.null2String(paramClassDeclaredField.get(hrmResourceImportParam)).equals("")) {
-                                        resourceParams.put(s, null);
-                                    } else {
-                                        resourceParams.put(s, paramClassDeclaredField.get(hrmResourceImportParam));
-                                    }
-                                } else if (isNumber) {
-                                    String insertValueStr = Util.null2String(paramClassDeclaredField.get(hrmResourceImportParam));
-                                    if ("".equals(insertValueStr) && recordSet.getDBType().equalsIgnoreCase("postgresql")) {
-                                        resourceParams.put(s, null);
-                                    } else {
-                                        resourceParams.put(s, paramClassDeclaredField.get(hrmResourceImportParam));
-                                    }
-
-                                }
-                            }
-                        }
-                        resourceParams.put("creator", createrid);
-                        resourceParams.put("delete_type", 0);
-                        resourceParams.put("create_time", date);
-                        ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName("jcl_org_hrmresource").params(resourceParams).build();
-                        int insertCount = getExtMapper().insertExt(infoParams);
-                        //添加人员信息
-                        if (insertCount != 1) {
-                            flag = false;
-                        }
-
-                        /*写日志*/
-                        if (flag) {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "成功", ""));
-                        } else {
-                            resultList.add(createLog(hrmResourceImportParam, "创建", "失败", "系统错误，请联系管理员"));
-                        }
-
-                    } else {    //更新人员
-                        if (keyMap.get(key) == null) {
-                            resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(83535, userlanguage)));
-                            continue;
-                        }
-
-                        hrmResourceImportParam.setId(Long.parseLong(keyMap.get(key).toString()));//设置id
-                        if (this.checkInfo(hrmResourceImportParam, resultList)) {
-                            continue;
-                        }
-
-                        if (hrmResourceImportParam.getAccount_type() == null || "".equalsIgnoreCase(Util.null2String(hrmResourceImportParam.getAccount_type()))) {
-                            if (StringUtil.isNotNull(hrmResourceImportParam.getCertificate_num()) && certificateNums.get(StringUtil.vString(hrmResourceImportParam.getCertificate_num())) != null) {
-                                if (StringUtil.parseToInt(String.valueOf(keyMap.get(key))) != StringUtil.parseToInt(String.valueOf(certificateNums.get(StringUtil.vString(hrmResourceImportParam.getCertificate_num()))))) {
-                                    resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(83521, userlanguage)));
-                                    continue;
-                                }
-                            }
-                        } else {
-                            if (hrmResourceImportParam.getAccount_type() != null && !"".equals(hrmResourceImportParam.getAccount_type())) {
-                                if ("主账号".equals(hrmResourceImportParam.getAccount_type())) {
-                                    if (StringUtil.isNotNull(hrmResourceImportParam.getCertificate_num()) && certificateNums.get(StringUtil.vString(hrmResourceImportParam.getCertificate_num())) != null) {
-                                        if (StringUtil.parseToInt(String.valueOf(keyMap.get(key))) != StringUtil.parseToInt(String.valueOf(certificateNums.get(StringUtil.vString(hrmResourceImportParam.getCertificate_num()))))) {
-                                            resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(83521, userlanguage)));
-                                            continue;
-                                        }
-                                    }
-                                }
-                            }
-                        }
-
-                        String hrmId = String.valueOf(keyMap.get(key));
-
-                        //分部id
-                        String subCompanyNames = hrmResourceImportParam.getCompany_id();
-                        boolean issameSub = true;
-                        if (!"".equals(Util.null2String(subCompanyNames))) {
-                            if (!subCompanyNames.equals(subCompanyName)) {
-                                subCompanyName = subCompanyNames;
-                                companyId = getSubCompanyId(subCompanyName);
-                                issameSub = false;
-                            }
-                            if (companyId == -9) {
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getErrorMsgName(56, userlanguage)));
-                                continue;
-                            }
-                            if (companyId == -2) {
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(126274, userlanguage)));
-                                continue;
-                            }
-                            if (companyId == 0 || companyId == -1) {
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", companyId == 0 ? SystemEnv.getHtmlLabelName(83536, userlanguage) : SystemEnv.getHtmlLabelName(83524, userlanguage)));
-                                continue;
-                            }
-
-                            //qc139575 在验证并发非并发之前需要先CkHrmnum
-                            license.CkHrmnum();
-                            if (StringUtil.parseToInt(license.getConcurrentFlag(), 0) != 1) {
-                                if (!issameSub && new HrmResourceManager().noMore(String.valueOf(companyId))) {
-                                    resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(83525, userlanguage)));
-                                    continue;
-                                }
-                            }
-                            companyId = 0 == companyId ? null : companyId;
-                            hrmResourcePO.setCompanyId(companyId);
-                        }
-
-                        // 部门id
-                        String departmentNames = hrmResourceImportParam.getDepartment_id();
-                        if (!"".equals(Util.null2String(departmentNames))) {  //部门存在时
-                            if (!issameSub || !departmentNames.equals(departmentName)) {
-                                departmentName = departmentNames;
-                            }
-                            departmentId = getDeptId(departmentName, companyId);
-                            if (departmentId == 0) {
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(83537, userlanguage)));
-                                continue;
-                            }
-                            if (departmentId == -2) {
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(126275, userlanguage)));
-                                continue;
-                            }
-                            hrmResourcePO.setDepartmentId(departmentId);
-                        }
-
-                        //主账号id-sunjsh
-                        if (hrmResourceImportParam.getAccount_type() != null && !"".equals(hrmResourceImportParam.getAccount_type())) {
-                            if ("主账号".equals(hrmResourceImportParam.getAccount_type())) {
-                                hrmResourcePO.setBelongTo(-1L);
-                                hrmResourcePO.setAccountType(0);
-                            } else if ("次账号".equals(hrmResourceImportParam.getAccount_type())) {
-                                if (hrmResourceImportParam.getBelong_to() != null && !"".equals(hrmResourceImportParam.getBelong_to().trim())) {
-                                    long belongto = getBelongId(hrmResourceImportParam.getBelong_to(), keyField);
-                                    hrmResourcePO.setBelongTo(belongto);
-                                    if (!hrmResourceImportParam.getBelong_to().equals("") && belongto == 0) {
-                                        resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(131279, userlanguage)));
-                                        continue;
-                                    } else {
-                                        hrmResourcePO.setAccountType(1);
-                                    }
-                                } else {
-                                    resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(131279, userlanguage)));
-                                    continue;
-                                }
-                            } else {
-                                hrmResourcePO.setBelongTo(-1L);
-                                hrmResourcePO.setAccountType(0);
-                            }
-                        } else if (hrmResourceImportParam.getBelong_to() != null && !"".equals(hrmResourceImportParam.getBelong_to().trim())) {
-                            long belongto = getBelongId(hrmResourceImportParam.getBelong_to(), keyField);
-                            hrmResourcePO.setBelongTo(belongto);
-                            if (!hrmResourceImportParam.getBelong_to().equals("") && belongto == 0) {
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(131279, userlanguage)));
-                                continue;
-                            } else {
-                                hrmResourcePO.setAccountType(1);
-                            }
-                        }
-
-                        // TODO 岗位id
-                        if ("".equals(Util.null2String(hrmResourceImportParam.getJob_title())) && (!"".equals(Util.null2String(hrmResourceImportParam.getJob_activity())) || !"".equals(Util.null2String(hrmResourceImportParam.getJob_group_id())))) {
-                            resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(83544, userlanguage)));
-                            continue;
-                        }
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getJob_title()))) {
-                            String jobNames = hrmResourceImportParam.getJob_title();
-                            hrmResourcePO.setJobTitle(getJobTitles(companyId, departmentId, jobNames));
-                        }
-                        if (Util.getIntValue(hrmId) < 0) {
-                            continue;
-                        }
-
-                        // 级序列
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getManager_id()))) {
-                            int managerid = getManagerId(hrmResourceImportParam.getManager_id(), keyField);
-                            //如果vo.getManagerid()有值，但manageid未找到，说明填写有误
-                            if (hrmResourceImportParam.getManager_id() != null && !hrmResourceImportParam.getManager_id().equals("") && managerid == 0) {
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(83532, userlanguage)));
-                                continue;
-                            }
-                            hrmResourcePO.setManagerId(0 == managerid ? null : managerid);
-                        } else {
-                            hrmResourcePO.setManagerId(null);
-                        }
-                        // 助理id
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getAssistant_id()))) {
-                            int assistantId;
-                            assistantId = getAssistantId(hrmResourceImportParam.getAssistant_id(), keyField);
-                            if (hrmResourceImportParam.getAssistant_id() != null && !hrmResourceImportParam.getAssistant_id().equals("") && assistantId == 0) {
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(24678, userlanguage)));
-                                continue;
-                            }
-                            hrmResourcePO.setAssistantId(assistantId);
-                        }
-                        // 办公地点
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getLocation_id()))) {
-                            int locationid = getLocationId(hrmResourceImportParam.getLocation_id());
-                            hrmResourcePO.setLocationId(locationid);
-                        }
-
-                        //邮箱-sunjsh
-                        if (hrmResourceImportParam.getEmail() != null) {
-                            if (!"".equals(hrmResourceImportParam.getEmail().trim()) && hrmResourceImportParam.getEmail().contains("*")) {
-                                hrmResourceImportParam.setEmail(null);
-                            } else if ("".equals(hrmResourceImportParam.getEmail().trim())) {
-                                hrmResourcePO.setEmail("");
-                            } else {
-                                Pattern pattern = Pattern.compile("^([a-zA-Z\\d_\\-.]+)@((\\[\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.)|(([a-zA-Z\\d\\-]+\\.)+))([a-zA-Z]{2,4}|\\d{1,3})(]?)$");
-                                Matcher matcher = pattern.matcher(hrmResourceImportParam.getEmail());
-                                if (!matcher.matches()) {
-                                    resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(24570, userlanguage)));
-                                    continue;
-                                } else {
-                                    hrmResourcePO.setEmail(hrmResourceImportParam.getEmail());
-                                }
-                            }
-                        }
-
-                        //mobile-sunjsh
-                        if (hrmResourceImportParam.getMobile() != null) {
-                            if ("".equals(hrmResourceImportParam.getMobile().trim())) hrmResourcePO.setMobile("");
-                            else if (!"".equals(hrmResourceImportParam.getMobile().trim()) && hrmResourceImportParam.getMobile().contains("*"))
-                                hrmResourceImportParam.setMobile(null);
-                        }
-
-                        //工资银行-sunjsh
-                        if (hrmResourceImportParam.getBank_id() != null && !"".equals(hrmResourceImportParam.getBank_id())) {
-                            org.json.JSONObject jsonObject = new org.json.JSONObject();
-                            jsonObject.put("fieldid", 0);
-                            jsonObject.put("fieldhtmltype", 3);
-                            jsonObject.put("type", 284);
-                            jsonObject.put("dmlurl", "");
-                            jsonObject.put("fieldvalue", hrmResourceImportParam.getBank_id());
-
-                            String fieldvalue = HrmFieldManager.getReallyFieldvalue(jsonObject);
-                            if (!"".equals(fieldvalue)) {
-                                hrmResourcePO.setBankId(new Integer(fieldvalue));
-                            } else {
-                                hrmResourcePO.setBankId(this.getBankId(hrmResourceImportParam.getBank_id()));
-                            }
-                        }
-
-                        //sunjsh-入职日期
-                        if (hrmResourceImportParam.getCompany_start_date() != null && !"".equals(hrmResourceImportParam.getCompany_start_date())) {
-                            hrmResourcePO.setCompanyStartDate(hrmResourceImportParam.getCompany_start_date());
-                        } else {
-                            hrmResourceImportParam.setCompany_start_date(null);
-                        }
-
-                        //sunjsh-参加工作日期
-                        if (hrmResourceImportParam.getWork_start_date() != null && !"".equals(hrmResourceImportParam.getWork_start_date())) {
-                            hrmResourcePO.setWorkStartDate(hrmResourceImportParam.getWork_start_date());
-                        } else {
-                            hrmResourceImportParam.setWork_start_date(null);
-                        }
-                        // 职称
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getJob_call()))) {
-                            hrmResourcePO.setJobCall(getJobCall(hrmResourceImportParam.getJob_call()));
-                        }
-                        // 系统语言，默认简体中文
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getSystem_language()))) {
-                            int systemlanguage = getSystemLanguage(hrmResourceImportParam.getSystem_language());
-
-                            if (systemlanguage == -1) {    //只能选择简体中文|Englisth|繁体中文
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(518929, userlanguage)));
-                                continue;
-                            }
-                            //系统不支持多语言
-                            if (systemlanguage == 0) {
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(84810, userlanguage)));
-                                continue;
-                            }
-                            hrmResourcePO.setSystemLanguage(systemlanguage);
-                        }
-
-                        // 性别，为空或其他情况统一为0(男)
-                        if (hrmResourceImportParam.getSex() == null) {
-                            hrmResourcePO.setSex("0");
-                        } else if (!"".equals(Util.null2String(hrmResourceImportParam.getSex()))) {
-                            String sex = hrmResourceImportParam.getSex().equals("女") ? "1" : "0";
-                            hrmResourcePO.setSex(sex);
-                        }
-
-                        // 婚姻状况，如果不是以下选项，则默认为未婚
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getMarital_status()))) {
-                            String maritalstatus = hrmResourceImportParam.getMarital_status().equals("已婚") ? "1" : hrmResourceImportParam.getMarital_status().equals("离异") ? "2" : "0";
-                            hrmResourcePO.setMaritalStatus(maritalstatus);
-                        }
-
-                        // 员工状态
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getStatus()))) {
-                            int status = getStatus(hrmResourceImportParam.getStatus());
-                            hrmResourcePO.setStatus(status);
-                        } else {
-                            hrmResourcePO.setStatus(0);
-                        }
-
-                        // 人员密级
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getClassification()))) {
-                            int classification = getClassification(hrmResourceImportParam.getClassification());
-                            hrmResourcePO.setClassification(classification);
-                        }
-
-                        // 学历
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getEducation_level()))) {
-                            int educationlevel = getEducationLevel(hrmResourceImportParam.getEducation_level());
-                            hrmResourcePO.setEducationLevel(educationlevel);
-                        }
-
-                        // 工会会员,默认为是
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getIslabouunion()))) {
-                            String islabouunion = hrmResourceImportParam.getIslabouunion().equals("是") ? "1" : "0";
-                            hrmResourcePO.setIslabouunion(islabouunion);
-                        }
-
-                        // 健康状况
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getHealth_info()))) {
-                            String healthinfo = getHealthInfo(hrmResourceImportParam.getHealth_info());
-                            hrmResourcePO.setHealthInfo(healthinfo);
-                        }
-
-                        //安全级别不能大于999
-                        if (Util.getIntValue(hrmResourceImportParam.getSec_level(), 0) > 999) {
-                            resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(515522, userlanguage)));
-                            continue;
-                        }
-                        //安全级别不能小于-999
-                        if (Util.getIntValue(hrmResourceImportParam.getSec_level(), 0) < -999) {
-                            resultList.add(createLog(hrmResourceImportParam, "更新", "失败", SystemEnv.getHtmlLabelName(515523, userlanguage)));
-                            continue;
-                        }
-                        //安全级别必须是数字
-                        if (!Util.null2String(hrmResourceImportParam.getSec_level()).equals("")) {
-                            if (Util.getIntValue(hrmResourceImportParam.getSec_level(), -1000) == -1000) {
-                                resultList.add(createLog(hrmResourceImportParam, "更新", "失败", "安全级别必须是数字"));
-                                continue;
-                            } else {
-                                hrmResourcePO.setSecLevel(Util.getIntValue(hrmResourceImportParam.getSec_level()));
-                            }
-                        }
-
-                        //职级
-                        if (isInteger(hrmResourceImportParam.getJob_level())) {
-                            int joblevel = hrmResourceImportParam.getJob_level().equals("") ? 0 : Integer.parseInt(hrmResourceImportParam.getJob_level());
-                            hrmResourcePO.setJobLevel((long) joblevel);
-                        }
-
-                        // 职务分类
-                        Long jobGroupId = null;
-                        if (hrmResourceImportParam.getJob_group_id() != null) {
-                            List<PostPO> postPOS = getPostMapper().listByName(hrmResourceImportParam.getJob_group_id());
-                            if (CollectionUtils.isNotEmpty(postPOS)) {
-                                jobGroupId = postPOS.get(0).getId();
-                            } else {
-                                PostPO postPO = PostPO.builder()
-                                        .postName(hrmResourceImportParam.getJob_group_id())
-                                        .creator((long) user.getUID())
-                                        .deleteType(0)
-                                        .createTime(new Date())
-                                        .build();
-                                getPostMapper().insertIgnoreNull(postPO);
-                                jobGroupId = postPO.getId();
-                            }
-                            hrmResourcePO.setJobGroupId(jobGroupId);
-                        }
-
-                        // 职务
-                        if (hrmResourceImportParam.getJob_activity() != null) {
-                            if (null == jobGroupId) {
-                                resultList.add(createLog(hrmResourceImportParam, "创建", "失败", "职务导入错误，未找到对应职务类别"));
-                                continue;
-                            }
-                            PostInfoPO postInfoPO = getPostInfoMapper().getPostInfoByNameAndPostId(hrmResourceImportParam.getJob_activity(), jobGroupId);
-                            if (null == postInfoPO) {
-                                postInfoPO = PostInfoPO.builder()
-                                        .postInfoNo(hrmResourceImportParam.getJob_activity())
-                                        .postInfoName(hrmResourceImportParam.getJob_activity())
-                                        .postId(jobGroupId)
-                                        .creator((long) user.getUID())
-                                        .deleteType(0)
-                                        .createTime(new Date())
-                                        .build();
-                                getPostInfoMapper().insertIgnoreNull(postInfoPO);
-                            }
-                            hrmResourcePO.setJobActivity(postInfoPO.getId());
-                        }
-
-                        //用工性质
-                        if (hrmResourceImportParam.getUse_kind() != null) {
-                            int usekind = getUseKind(hrmResourceImportParam.getUse_kind());
-                            hrmResourcePO.setUseKind(usekind);
-                        }
-
-                        // 手机 办公电话
-                        CheckItemBean mobileBean = new CheckItemBean("mobile", hrmResourceImportParam.getMobile());
-                        ValidateFieldManager.validate(mobileBean);
-                        if (!mobileBean.isPass()) {
-                            resultList.add(createLog(hrmResourceImportParam, "更新", "失败", mobileBean.getCheckMsg()));
-                            continue;
-                        }
-                        CheckItemBean telephoneBean = new CheckItemBean("telephone", hrmResourceImportParam.getTelephone());
-                        ValidateFieldManager.validate(telephoneBean);
-                        if (!telephoneBean.isPass()) {
-                            resultList.add(createLog(hrmResourceImportParam, "更新", "失败", telephoneBean.getCheckMsg()));
-                            continue;
-                        }
-
-
-                        //密码 加密
-                        if (!"".equals(Util.null2String(hrmResourceImportParam.getPass_word()))) {
-
-                            String orgPwd = "1";
-                            if (!"".equals(hrmResourceImportParam.getPass_word()))
-                                orgPwd = hrmResourceImportParam.getPass_word();
-                            String[] pwdArr = PasswordUtil.encrypt(orgPwd);
-                            String salt = pwdArr[1];
-                            hrmResourcePO.setPassWord(pwdArr[0]);
-
-                            PasswordUtil.updateResourceSalt(keyMap.get(key) + "", salt);
-                            HrmFaceCheckManager.setUserPassowrd(keyMap.get(key) + "", orgPwd);
-
-                        }
-                        Map<String, Object> resourceParams = new HashMap<>();
-
-                        for (int k = 1; k < fields.length; k++) {
-                            Field hrmField = resourcePOClass.getDeclaredField(PageInfoSortUtil.underlineToHump(fields[k]));
-                            Field paramClassDeclaredField = importParamClass.getDeclaredField(fields[k]);
-
-                            String hrmFieldType = hrmField.getType().getName();
-                            String voFieldType = paramClassDeclaredField.getType().getName();
-
-                            hrmField.setAccessible(true);
-                            paramClassDeclaredField.setAccessible(true);
-
-                            if (Util.null2String(hrmField.get(hrmResourcePO)).trim().length() > 0) {
-                                if (hrmFieldType.endsWith("String")) {
-                                    resourceParams.put(fields[k], hrmField.get(hrmResourcePO));
-                                } else if (hrmFieldType.endsWith("Long") || hrmFieldType.endsWith("Integer") || hrmFieldType.endsWith("Short") || hrmFieldType.endsWith("Float")) {
-                                    resourceParams.put(fields[k], hrmField.get(hrmResourcePO));
-                                }
-                            } else if (Util.null2String(paramClassDeclaredField.get(hrmResourceImportParam)).trim().length() > 0) {
-                                if (voFieldType.endsWith("String")) {
-                                    if (Util.null2String(paramClassDeclaredField.get(hrmResourceImportParam)).equals("")) {
-                                        resourceParams.put(fields[k], null);
-                                    } else {
-                                        resourceParams.put(fields[k], paramClassDeclaredField.get(hrmResourceImportParam));
-                                    }
-                                } else if (voFieldType.endsWith("Long") || voFieldType.endsWith("Integer") || voFieldType.endsWith("Short") || voFieldType.endsWith("Float")) {
-                                    if (voFieldType.endsWith("Integer") && (paramClassDeclaredField.get(hrmResourceImportParam).equals(0x7fffffff))) {
-                                        resourceParams.put(fields[k], null);
-                                    } else {
-                                        resourceParams.put(fields[k], paramClassDeclaredField.get(hrmResourceImportParam));
-                                    }
-                                }
-                            }
-                        }
-                        resourceParams.put("update_time", DateUtil.getCurrentDate());
-                        ExtendInfoParams infoParams = ExtendInfoParams.builder().id((long) keyMap.get(key)).tableName("jcl_org_hrmresource").params(resourceParams).build();
-                        getExtMapper().updateExt(infoParams);
-                    }
-                } catch (Exception e) {
-                    //数据异常
-                    new BaseBean().writeLog(e);
-                }
-            }
-            try {
-                HrmTlevelManager.setUpdate();
-            } catch (Exception e) {
-                new BaseBean().writeLog(e);
-            }
-
-            Map<String, Object> params = new HashMap<>();
-            params.put("pId", this.pId);
-            params.put("status", "over");
-            importLogService.saveImportLogStatus(params, user);
-
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-            Map<String, Object> params = new HashMap<>();
-            params.put("pId", this.pId);
-            params.put("status", "error");
-            importLogService.saveImportLogStatus(params, user);
-        }
-    }
-
-
-    /**
-     * 根据分部名称获取分部Id，不存在就创建
-     *
-     * @param subCompanyName 分部名称 eg：泛微广东>泛微深圳
-     */
-    public Long getSubCompanyId(String subCompanyName) {
-
-        String[] subCompanyNames = subCompanyName.split(">");
-        if (subCompanyNames.length >= 10) {
-            return -9L;
-        }
-        long currentId = 0L;
-        long parentId = 0L;
-        int curCount = 0;
-
-        for (String companyName : subCompanyNames) {
-            if (StringUtil.isNull(companyName)) {
-                continue;
-            }
-
-            Long companyId = getCompMapper().getIdByNameAndPid(companyName.trim(), parentId);
-            currentId = null == companyId ? 0 : companyId;
-
-            if (parentId == 0 && currentId == 0) {
-                curCount = getCompMapper().countTopCompany(0L);
-
-            }
-
-            //added by wcd 2015-02-06 [限制分部数]
-            if (currentId == 0) {
-                if (scCount == 0 || curCount < scCount) {
-                    // 如果编码为空 自动生成编码
-                    String compNo = "";
-                    try {
-                        compNo = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.SUBCOMPANY, compNo);
-                    } catch (Exception e) {
-                        new BaseBean().writeLog(e);
-                    }
-                    CompPO compPO = CompPO.builder()
-                            .compNo(compNo)
-                            .compName(companyName.trim())
-                            .compNameShort(companyName.trim())
-                            .parentCompany(0 == parentId ? null : parentId)
-                            .creator((long) user.getUID())
-                            .deleteType(0)
-                            .createTime(new Date())
-                            .build();
-                    getCompMapper().insertIgnoreNull(compPO);
-                    currentId = compPO.getId().intValue();
-
-                } else {
-                    currentId = -1;
-                }
-            }
-            parentId = currentId;
-        }
-        return currentId;
-    }
-
-    /**
-     * 获取部门id，不存在就创建
-     *
-     * @param deptNames 部门名称
-     * @param companyId 所属分部id
-     */
-    public Long getDeptId(String deptNames, long companyId) {
-
-        String[] deptNameArray = deptNames.split(">");
-        long currentId = 0L;
-        long parentId = 0L;
-
-        for (String deptName : deptNameArray) {
-            if (deptName == null || deptName.equals("")) {
-                continue;
-            }
-            Long departmentId = getDepartmentMapper().getIdByNameAndPid(deptName.trim(), companyId, parentId);
-            currentId = null == departmentId ? 0 : departmentId;
-
-            if (currentId == 0) {
-                // 如果编码为空 自动生成编码
-                String deptNo = "";
-                try {
-                    deptNo = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.DEPARTMENT, deptNo);
-                } catch (Exception e) {
-                    new BaseBean().writeLog(e);
-                }
-                DepartmentPO departmentPO = DepartmentPO.builder()
-                        .deptNo(deptNo)
-                        .deptName(deptName.trim())
-                        .deptNameShort(deptName.trim())
-                        .parentComp(0 == companyId ? null : companyId)
-                        .parentDept(0 == parentId ? null : parentId)
-                        .forbiddenTag(0)
-                        .creator((long) user.getUID())
-                        .deleteType(0)
-                        .createTime(new Date())
-                        .build();
-                getDepartmentMapper().insertIgnoreNull(departmentPO);
-                currentId = departmentPO.getId().intValue();
-            }
-            parentId = currentId;
-        }
-        return currentId;
-    }
-
-    public Long getJobTitles(Long companyId, Long departmentId, String jobNames) {
-
-
-        String[] jobNameArray = jobNames.split(">");
-        long currentId = 0L;
-        long parentId = 0L;
-
-        for (String jobName : jobNameArray) {
-            if (jobName == null || jobName.equals("")) {
-                continue;
-            }
-            Long jobId = getJobMapper().getIdByNameAndPid(jobName.trim(), companyId, departmentId, parentId);
-            currentId = null == jobId ? 0 : jobId;
-            if (currentId == 0) {
-                // 如果编码为空 自动生成编码
-                String jobNo = "";
-                try {
-                    jobNo = CodeRuleManager.getCodeRuleManager().generateRuleCode(RuleCodeType.JOBTITLES, jobNo);
-                } catch (Exception e) {
-                    new BaseBean().writeLog(e);
-                }
-                JobPO jobPO = JobPO.builder()
-                        .jobNo(jobNo)
-                        .jobName(jobName)
-                        .parentComp(0 == companyId ? null : companyId)
-                        .parentDept(0 == departmentId ? null : departmentId)
-                        .parentJob(0 == parentId ? null : parentId)
-                        .forbiddenTag(0)
-                        .creator((long) user.getUID())
-                        .deleteType(0)
-                        .createTime(new Date())
-                        .build();
-                getJobMapper().insertIgnoreNull(jobPO);
-                currentId = jobPO.getId();
-            }
-            parentId = currentId;
-        }
-        return currentId;
-    }
-
-
-    /**
-     * 获取直接上级Id和所有上级
-     *
-     * @param keyFieldValue 上级标记值，eg:编号
-     * @param keyField      关键字段
-     */
-    public int getManagerId(String keyFieldValue, String keyField) {
-
-        int managerId = 0;
-        if (!keyFieldValue.equals("")) {
-            Integer userId = getResourceMapper().getIdByKeyField(keyField, keyFieldValue);
-            managerId = null == userId ? 0 : userId;
-        }
-        return managerId;
-    }
-
-    /**
-     * 获取助理id
-     *
-     * @param keyFieldValue 助理标记
-     * @param keyField      关键字段
-     */
-    public int getAssistantId(String keyFieldValue, String keyField) {
-        return getResourceId(keyFieldValue, keyField, 0);
-    }
-
-    private int getResourceId(String keyFieldValue, String keyField, int resourceId) {
-        if (!keyFieldValue.equals("")) {
-            Integer userId = getResourceMapper().getIdByKeyField(keyField, keyFieldValue);
-            resourceId = null == userId ? 0 : userId;
-        }
-        return resourceId;
-    }
-
-    /**
-     * 获取主账号id
-     *
-     * @param keyFieldValue 主账号标记
-     * @param keyField      关键字段
-     */
-    public Long getBelongId(String keyFieldValue, String keyField) {
-        return (long) getResourceId(keyFieldValue, keyField, -1);
-    }
-
-    /**
-     * 办公地点id
-     *
-     * @param locationName 办公地点名称
-     */
-    public int getLocationId(String locationName) {
-        int locationId = 0;
-        if (!locationName.equals("")) {
-            locationId = locationMap.getOrDefault(locationName, 0);
-            if (locationId == 0) {
-                Map<String, Object> hrmLocationsMap = new HashMap<>();
-                hrmLocationsMap.put("locationname", locationName);
-                hrmLocationsMap.put("locationdesc", locationName);
-                hrmLocationsMap.put("countryid", 1);
-                ExtendInfoParams extendInfoParams = ExtendInfoParams.builder().params(hrmLocationsMap).tableName("HrmLocations").build();
-                getExtMapper().insertExt(extendInfoParams);
-                locationId = extendInfoParams.getId().intValue();
-                locationMap.put(locationName, locationId);
-            }
-        }
-        return locationId;
-    }
-
-    /**
-     * 用工性质id
-     *
-     * @param useKindName 用工性质名称
-     */
-    public int getUseKind(String useKindName) {
-        int usekindid = 0;
-        if (!useKindName.equals("")) {
-            usekindid = usekindMap.getOrDefault(useKindName, 0);
-            if (usekindid == 0) {
-                Map<String, Object> hrmUseKindMap = new HashMap<>();
-                hrmUseKindMap.put("name", useKindName);
-                hrmUseKindMap.put("description", useKindName);
-                ExtendInfoParams extendInfoParams = ExtendInfoParams.builder().params(hrmUseKindMap).tableName("HrmUseKind").build();
-                getExtMapper().insertExt(extendInfoParams);
-                usekindid = extendInfoParams.getId().intValue();
-                usekindMap.put(useKindName, usekindid);
-            }
-        }
-        return usekindid;
-    }
-
-    /**
-     * 职称
-     *
-     * @param jobCall 职称名称
-     */
-    public int getJobCall(String jobCall) {
-        int jobCallId = 0;
-        if (!jobCall.equals("")) {
-            jobCallId = jobcallMap.getOrDefault(jobCall, 0);
-            if (jobCallId == 0) {
-                Map<String, Object> hrmJobCallMap = new HashMap<>();
-                hrmJobCallMap.put("name", jobCall);
-                ExtendInfoParams extendInfoParams = ExtendInfoParams.builder().params(hrmJobCallMap).tableName("HrmJobCall").build();
-                getExtMapper().insertExt(extendInfoParams);
-                jobCallId = extendInfoParams.getId().intValue();
-                jobcallMap.put(jobCall, jobCallId);
-            }
-        }
-        return jobCallId;
-    }
-
-    /**
-     * 系统语言
-     *
-     * @param language 语言 eg：简体中文,English,繁體中文
-     */
-    public int getSystemLanguage(String language) {
-        int systemlanguageid = 7;  //系统语言默认为中文
-        //如果系统不支持多语言，则返回0
-        if ((language.equals("English") || language.equals("繁體中文")) && !multilanguage.equalsIgnoreCase("y")) {
-            return 0;
-        }
-        if (!language.equals("")) {
-            if (language.equals("简体中文")) {
-                systemlanguageid = cnLanguageId;
-            } else {
-                systemlanguageid = sysLanguage.getOrDefault(language, -1);
-            }
-        }
-        return systemlanguageid;
-    }
-
-    /**
-     * 工资银行id
-     *
-     * @param bank 办公地点名称
-     */
-    public int getBankId(String bank) {
-        int id = 0;
-        if (!bank.equals("")) {
-            Map<String, Object> hrmBankMap = new HashMap<>();
-            hrmBankMap.put("bankname", bank);
-            hrmBankMap.put("bankdesc", bank);
-            ExtendInfoParams extendInfoParams = ExtendInfoParams.builder().params(hrmBankMap).tableName("hrmbank").build();
-            getExtMapper().insertExt(extendInfoParams);
-            id = extendInfoParams.getId().intValue();
-        }
-        return id;
-    }
-
-    /**
-     * 获取员工状态
-     *
-     * @param status 员工状态值
-     */
-    public int getStatus(String status) {
-        int statusId;
-        switch (status) {
-            case "试用":
-                statusId = 0;
-                break;
-            case "临时":
-                statusId = 2;
-                break;
-            case "试用延期":
-                statusId = 3;
-                break;
-            case "解聘":
-                statusId = 4;
-                break;
-            case "离职":
-                statusId = 5;
-                break;
-            case "退休":
-                statusId = 6;
-                break;
-            case "无效":
-                statusId = 7;
-                break;
-            default:
-                statusId = 1;
-                break;
-        }
-        return statusId;
-    }
-
-    /**
-     * 获取人员密级
-     */
-    public int getClassification(String classification) {
-
-        int classificationId;
-        switch (classification) {
-            case "核心":
-                classificationId = 0;
-                break;
-            case "重要":
-                classificationId = 1;
-                break;
-            case "一般":
-                classificationId = 2;
-                break;
-            default:
-                classificationId = 3;
-                break;
-        }
-        return classificationId;
-    }
-
-    /**
-     * 获取学历Id
-     *
-     * @param educationLevel 学历值
-     */
-    public int getEducationLevel(String educationLevel) {
-        int educationLevelId = 0;
-        if (!educationLevel.equals("")) {
-            educationLevelId = educationlevelMap.getOrDefault(educationLevel, 0);
-            if (educationLevelId == 0) {
-                Map<String, Object> hrmEducationLevelMap = new HashMap<>();
-                hrmEducationLevelMap.put("name", educationLevel);
-                hrmEducationLevelMap.put("description", educationLevel);
-                ExtendInfoParams extendInfoParams = ExtendInfoParams.builder().params(hrmEducationLevelMap).tableName("HrmEducationLevel").build();
-                getExtMapper().insertExt(extendInfoParams);
-                educationLevelId = extendInfoParams.getId().intValue();
-                educationlevelMap.put(educationLevel, educationLevelId);
-            }
-        }
-        return educationLevelId;
-    }
-
-    /**
-     * 获取身体状况
-     */
-    public String getHealthInfo(String healthInfo) {
-        String healthInfoId;
-        switch (healthInfo) {
-            case "良好":
-                healthInfoId = "1";
-                break;
-            case "一般":
-                healthInfoId = "2";
-                break;
-            case "较差":
-                healthInfoId = "3";
-                break;
-            default:
-                healthInfoId = "0";
-                break;
-        }
-        return healthInfoId;
-    }
-
-    /**
-     * 获取id与workcode_lastname 键值对，用于对导入数据重复性判断
-     *
-     * @param keyField key值，重复性验证字段
-     */
-    public void getKeyMap(String keyField) {
-        List<JSONObject> keyMaps = getResourceMapper().getKeyMapByKetField(keyField);
-        String cerNum;
-        for (JSONObject map : keyMaps) {
-            {
-                for (String key : checkKeys) {
-                    Map<String, String> checkInfo = checkInfos.get(key);
-                    if (checkInfo == null) {
-                        checkInfo = new HashMap<>();
-                        checkInfos.put(key, checkInfo);
-                    } else {
-                        checkInfo = checkInfos.get(key);
-                    }
-                    String val = Util.null2String(map.getString(key));
-                    checkInfo.put(val, map.getString("id"));
-                    checkInfos.put(key, checkInfo);
-                }
-
-                cerNum = map.getString("certificate_num");
-                keyMap.put(map.getString(keyField), map.getInteger("id"));
-                String accountType = map.getString("account_type");
-                if (!"1".equalsIgnoreCase(accountType)) {
-                    if (StringUtil.isNotNull(cerNum)) {
-                        certificateNums.put(StringUtil.vString(cerNum), map.getInteger("id"));
-                    }
-                }
-            }
-        }
-
-    }
-
-    /**
-     * 执行插入操作
-     */
-
-    public boolean execSql(String sql) {
-        RecordSet recordSet = new RecordSet();
-        return recordSet.execute(sql);
-    }
-
-    /**
-     * 创建日志对象
-     *
-     * @param importParam HrmResourceVo  人员信息对象
-     * @param operation   操作类型  验证|创建|更新
-     * @param status      状态 成功|失败
-     * @param reason      失败原因
-     * @return ImportLog对象
-     */
-    public ImportLog createLog(HrmResourceImportParam importParam, String operation, String status, String reason) {
-        ImportLog log = new ImportLog();
-
-        log.setWorkCode(importParam.getWork_code());  //编号
-        log.setLastname(importParam.getLast_name());  //用户名
-        log.setLoginid(importParam.getLogin_id());    //登录名
-        log.setOperation(operation);        //操作类型
-        if (importParam.getCompany_id() != null && importParam.getDepartment_id() != null)
-            log.setDepartment(importParam.getCompany_id() + ">" + importParam.getDepartment_id()); //分部部门
-        else log.setDepartment("");
-        log.setStatus(status);              //状态，成功、失败
-        log.setReason(reason);              //原因
-
-        try {
-            ImportLogService importLogService = ServiceUtil.getService(ImportLogServiceImpl.class, user);
-            String relatedName = "";
-            switch (this.keyField) {
-                case "work_code":
-                    relatedName = log.getWorkCode();
-                    break;
-                case "login_id":
-                    relatedName = log.getLoginid();
-                    break;
-                case "last_name":
-                    relatedName = log.getLastname();
-                    break;
-            }
-
-            Map<String, Object> params = new HashMap<>();
-            params.put("pId", this.pId);
-            params.put("lineNum", this.rowNum + 2);//修正偏移量错误
-            params.put("relatedName", relatedName);
-            params.put("msg", log.getStatus().equals("成功") ? relatedName + "导入成功！" : log.getReason());
-            params.put("status", log.getStatus().equals("成功") ? "1" : "0");
-            importLogService.saveImportDeitalLog(params, user);
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-        }
-        return log;
-    }
-
-    //整数判断
-    public static boolean isInteger(String str) {
-        if (str == null) return false;
-        Pattern pattern = Pattern.compile("\\d+");
-        return pattern.matcher(str).matches();
-    }
-
-
-    private boolean checkInfo(HrmResourceImportParam importParam, List<ImportLog> resultList) {
-        //新增账号、工号唯一性校验
-        for (String key : checkKeys) {
-            Map<String, String> checkInfo = checkInfos.get(key);
-            if (checkInfo != null && !checkInfo.isEmpty()) {
-                String val = "";
-                String errorMsg = "";
-                switch (key) {
-                    case "login_id":
-                        val = Util.null2String(importParam.getLogin_id()).trim();
-                        errorMsg = SystemEnv.getHtmlLabelName(522076, userlanguage);
-                        break;
-                    case "work_code":
-                        val = Util.null2String(importParam.getWork_code()).trim();
-                        errorMsg = SystemEnv.getHtmlLabelName(520197, userlanguage);
-                        break;
-                    case "certificate_num":
-                        val = Util.null2String(importParam.getCertificate_num()).trim();
-                        errorMsg = SystemEnv.getHtmlLabelName(83521, userlanguage);
-                        break;
-                }
-                int reosurceid = Util.getIntValue(checkInfo.get(val));
-                if (importParam.getId() != null && importParam.getId() == reosurceid) {
-                    //如果是当前记录，不需要校验
-                    continue;
-                }
-
-                if (reosurceid > 0 && val.length() > 0) {
-                    resultList.add(createLog(hrmResourceImportParam, this.operateType.equals("add") ? "创建" : "更新", "失败", errorMsg));
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-}
diff --git a/src/com/engine/organization/util/saveimport/SaveImportProcessUtil.java b/src/com/engine/organization/util/saveimport/SaveImportProcessUtil.java
deleted file mode 100644
index 534c101e..00000000
--- a/src/com/engine/organization/util/saveimport/SaveImportProcessUtil.java
+++ /dev/null
@@ -1,628 +0,0 @@
-package com.engine.organization.util.saveimport;
-
-import com.engine.common.util.ParamUtil;
-import com.engine.common.util.ServiceUtil;
-import com.engine.hrm.service.ImportLogService;
-import com.engine.hrm.service.impl.ImportLogServiceImpl;
-import org.apache.poi.hssf.usermodel.*;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.jetbrains.annotations.NotNull;
-import weaver.file.ImageFileManager;
-import weaver.general.BaseBean;
-import weaver.general.Util;
-import weaver.hrm.User;
-import weaver.hrm.excelimport.*;
-import weaver.systeminfo.SystemEnv;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * @author:dxfeng
- * @createTime: 2022/06/30
- * @version: 1.0
- */
-public class SaveImportProcessUtil {
-    /**
-     * 导入类型
-     */
-    private String importType;
-
-    /**
-     * excel页签
-     */
-    private HSSFSheet sheet;
-    /**
-     * 存储报错信息位置
-     */
-    private final List<Object> lsImportSourceMap = new ArrayList<>();
-    /**
-     * 存储报错信息
-     */
-    private final List<String> errorInfo = new ArrayList<>();
-    /**
-     * 存储参数类型名称
-     */
-    private final Map<String, Method> parameterTypes = new HashMap<>();
-    /**
-     * 字段类型
-     */
-    private final Map<String, String> fieldTypes = new HashMap<>();
-    /**
-     * 类名
-     */
-    private final Map<String, String[]> mapImportSource = new HashMap<>();
-    /**
-     * 导入类型名称
-     */
-    private final Map<String, String> mapImportSourceName = new HashMap<>();
-    /**
-     * excel文件中对应的字段别名
-     */
-    private final Map<String, String[]> mapImportSourceField = new HashMap<>();
-    /**
-     * excel文件中对应的字段名称
-     */
-    private final Map<String, String[]> mapImportSourceFieldName = new HashMap<>();
-    /**
-     * 多语言--中文
-     */
-    private int userLanguage = 7;
-    /**
-     * 字段名
-     */
-    private String[] voFields;
-    /**
-     * 类
-     */
-    private Class<?> importSourceClass;
-    /**
-     * 字段标识
-     */
-    private String keyField = "";
-    /**
-     * 操作人
-     */
-    private String creator = "";
-    /**
-     * 导入类型
-     */
-    private String operateType = "";
-    /**
-     * 常用组成员导入为覆盖时，清除旧数据只需要执行一次。false--还未清除旧数据、true--旧数据已经清除
-     */
-    private boolean isDeleted = false;
-
-    private User user;
-    private int pId = 0;
-
-    /**
-     * 客户端操作IP
-     */
-
-    public SaveImportProcessUtil() {
-        // TODO 组织导入类
-        mapImportSource.put("company", new String[]{CompanyImportUtil.class.getName()});
-
-        mapImportSource.put("jobtitle", new String[]{HrmJobTitle.class.getName()});
-        mapImportSource.put("group", new String[]{HrmGroup.class.getName()});
-        mapImportSource.put("groupMember", new String[]{HrmGroupMember.class.getName()});
-        mapImportSource.put("resourcedetial", new String[]{HrmFamilyInfo.class.getName(),
-                HrmLanguageAbility.class.getName(),
-                HrmEducationInfo.class.getName(),
-                HrmWorkResume.class.getName(),
-                HrmTrainBeforeWork.class.getName(),
-                HrmCertification.class.getName(),
-                HrmRewardBeforeWork.class.getName()});
-        mapImportSource.put("city", new String[]{HrmCity.class.getName()});
-        mapImportSource.put("location", new String[]{HrmLoaction.class.getName()});
-        mapImportSource.put("special", new String[]{HrmSpeciality.class.getName()});
-        mapImportSource.put("area", new String[]{HrmArea.class.getName()});
-        mapImportSource.put("sensitiveword", new String[]{SensitiveWord.class.getName()});
-
-        mapImportSourceName.put("company", "分部、部门导入");
-        mapImportSourceName.put("jobtitle", "岗位体系导入");
-        mapImportSourceName.put("group", "常用组信息导入");
-        mapImportSourceName.put("groupMember", "常用组成员导入");
-        mapImportSourceName.put("resourcedetial", "个人数据导入");
-        mapImportSourceName.put("city", "位置信息导入");
-        mapImportSourceName.put("location", "办公地点信息导入");
-        mapImportSourceName.put("special", "专业信息导入");
-        mapImportSourceName.put("area", "行政区域导入");
-        mapImportSourceName.put("sensitiveword", "敏感词");
-
-        mapImportSourceField.put("company", new String[]{"subcompanyname,departmentname,subcompanyshoworder,subcompanycode,departmentshoworder,departmentcode"});
-        mapImportSourceField.put("jobtitle", new String[]{"jobtitlemark,jobtitlename,jobtitlecode,jobactivityname,jobgroupname,jobresponsibility,jobcompetency,jobtitleremark"});
-        mapImportSourceField.put("group", new String[]{"typename,groupname,username,keycode"});
-        mapImportSourceField.put("groupMember", new String[]{"workCode,lastName,loginId"});
-        mapImportSourceField.put("resourcedetial", new String[]{"lastname,loginid,member,title,company,jobtitle,address",
-                "lastname,loginid,language,level_n,memo",
-                "lastname,loginid,school,speciality,startdate,enddate,educationlevel,studydesc",
-                "lastname,loginid,company,startdate,enddate,jobtitle,workdesc,leavereason",
-                "lastname,loginid,trainname,trainstartdate,trainenddate,trainresource,trainmemo",
-                "lastname,loginid,certname,datefrom,dateto,awardfrom",
-                "lastname,loginid,rewardname,rewarddate,rewardmemo"});
-        mapImportSourceField.put("city", new String[]{"位置信息导入"});
-        mapImportSourceField.put("location", new String[]{"locationname,locationdesc,locationcityname,countryname,showorder"});
-        mapImportSourceField.put("special", new String[]{"name,description"});
-        mapImportSourceField.put("area", new String[]{"countryname,provincename,cityname,citytwoname,longitude,latitude"});
-        mapImportSourceField.put("sensitiveword", new String[]{"word,description,wordtype,handleway"});
-
-
-        mapImportSourceFieldName.put("company", new String[]{"分部[必填],部门,分部显示顺序,分部编号,部门显示顺序,部门编号"});
-        mapImportSourceFieldName.put("jobtitle", new String[]{"岗位简称[必填],岗位全称[必填],岗位编号,所属职务[必填],职务类别[必填],岗位职责,任职资格,备注"});
-        mapImportSourceFieldName.put("group", new String[]{"类型[必填],名称[必填],成员姓名[必填],成员登录名[必填]"});
-        mapImportSourceFieldName.put("groupMember", new String[]{"编号,姓名,登录名"});
-        mapImportSourceFieldName.put("resourcedetial", new String[]{"员工姓名[必填],员工登录名[必填],成员,称谓,工作单位,职务,地址",
-                "员工姓名[必填],员工登录名[必填],语言,水平,备注",
-                "员工姓名[必填],员工登录名[必填],学校名称,专业,开始日期,结束日期,学历,详细描述",
-                "员工姓名[必填],员工登录名[必填],公司名称,开始日期,结束日期,职务,工作描述,离开原因",
-                "员工姓名[必填],员工登录名[必填],培训名称,开始日期,结束日期,培训单位,备注",
-                "员工姓名[必填],员工登录名[必填],名称,开始日期,结束日期,颁发单位",
-                "员工姓名[必填],员工登录名[必填],奖惩名称,奖惩日期,备注"});
-        mapImportSourceFieldName.put("city", new String[]{"位置信息导入"});
-        mapImportSourceFieldName.put("location", new String[]{"办公地点简称[必填],办公地点全称[必填],城市[必填],国家,顺序"});
-        mapImportSourceFieldName.put("special", new String[]{"专业名称[必填],专业描述[必填]"});
-        mapImportSourceFieldName.put("area", new String[]{"国家[必填],省份,城市,区县,经度,纬度"});
-        mapImportSourceFieldName.put("sensitiveword", new String[]{"敏感词[必填],详细描述,所属分类[必填],处理方式[必填]"});
-    }
-
-    /**
-     * 读取数据
-     *
-     * @param request 请求
-     */
-    public List<String> importXls(HttpServletRequest request) {
-        ImportLogService importLogService = ServiceUtil.getService(ImportLogServiceImpl.class, user);
-        Map<String, Object> params;
-        try {
-            this.user = (User) request.getSession(true).getAttribute("weaver_user@bean");
-            String filename = request.getParameter("excelfile");
-            this.importType = Util.null2String(request.getParameter("importType"));
-            this.keyField = Util.null2String(request.getParameter("keyField"));
-            this.creator = "" + user.getUID();
-            this.userLanguage = Util.getIntValue(request.getParameter("userlanguage"), 7);
-            this.operateType = Util.null2String(request.getParameter("operateType"));
-            // 常用组导入为覆盖时，已经清除掉旧数据的常用组ID集合(暂时只用于常用组的导入)
-            List<Integer> deletedGroupId = new ArrayList<>();
-
-            ImageFileManager manager = new ImageFileManager();
-            manager.getImageFileInfoById(Util.getIntValue(filename));
-            HSSFWorkbook workbook = new HSSFWorkbook(new POIFSFileSystem(manager.getInputStream()));
-
-            params = ParamUtil.request2Map(request);
-            Map<String, Object> retmap = importLogService.saveImportLog(params, request, user);
-            if (Util.null2String(retmap.get("status")).equals("1")) {
-                this.pId = Util.getIntValue(Util.null2String(retmap.get("pId")));
-                String pIdName = "hrm" + this.importType + "PId";
-                request.getSession(true).setAttribute(pIdName, this.pId);
-            }
-
-            String[] tmpMapImportSource = mapImportSource.get(this.importType);
-            int idx = 0;
-            for (String tmpImportSource : tmpMapImportSource) {
-                idx++;
-                this.sheet = workbook.getSheetAt(idx);
-                importSourceClass = Class.forName(tmpImportSource);
-                voFields = mapImportSourceField.get(this.importType)[idx - 1].split(",");
-                initReflectParam();
-                /*校验模板有效性	*/
-                if (idx == 1) {
-                    String[] importSourceFieldName = mapImportSourceFieldName.get(this.importType);
-                    String valExcelTempInfo = valExcelTemp(importSourceFieldName[idx - 1]);
-                    if (valExcelTempInfo.length() > 0) {
-                        this.errorInfo.add(valExcelTempInfo);
-                        break;
-                    }
-                }
-                readexcel();
-                String importSourceName;
-                if (tmpImportSource.equals(HrmFamilyInfo.class.getName())) {
-                    importSourceName = SystemEnv.getHtmlLabelName(814, userLanguage);
-                } else if (tmpImportSource.equals(HrmLanguageAbility.class.getName())) {
-                    importSourceName = SystemEnv.getHtmlLabelName(815, userLanguage);
-                } else if (tmpImportSource.equals(HrmEducationInfo.class.getName())) {
-                    importSourceName = SystemEnv.getHtmlLabelName(813, userLanguage);
-                } else if (tmpImportSource.equals(HrmWorkResume.class.getName())) {
-                    importSourceName = SystemEnv.getHtmlLabelName(15716, userLanguage);
-                } else if (tmpImportSource.equals(HrmTrainBeforeWork.class.getName())) {
-                    importSourceName = SystemEnv.getHtmlLabelName(15717, userLanguage);
-                } else if (tmpImportSource.equals(HrmCertification.class.getName())) {
-                    importSourceName = SystemEnv.getHtmlLabelName(1502, userLanguage);
-                } else if (tmpImportSource.equals(HrmRewardBeforeWork.class.getName())) {
-                    importSourceName = SystemEnv.getHtmlLabelName(15718, userLanguage);
-                } else {
-                    importSourceName = mapImportSourceName.get(this.importType);
-                }
-                Object obj = null;
-                Method method;
-                String flag;
-                String valErrorInfo;
-                if (lsImportSourceMap.size() == 0) {
-                    this.errorInfo.add("【" + importSourceName + "】" + SystemEnv.getHtmlLabelName(34195, userLanguage) + "！");
-                }
-                if ("area".equals(importType)) {
-                    //如果是行政区域导入，先删除脏数据
-                    HrmArea.deleteDirtyData();
-                }
-                for (int i = 0; i < lsImportSourceMap.size(); i++) {
-                    obj = lsImportSourceMap.get(i);
-                    if (importType.equals("groupMember")) {
-                        String groupId = Util.null2String(request.getParameter("groupid"));
-
-                        method = importSourceClass.getMethod("setGroupid", String.class);
-                        method.invoke(obj, groupId);
-                    }
-
-                    method = importSourceClass.getMethod("setUserLanguage", String.class);
-                    method.invoke(obj, "" + userLanguage);
-                    if (this.importType.equals("company")) {
-                        method = importSourceClass.getMethod("setOperateType", String.class);
-                        method.invoke(obj, this.operateType);
-                    }
-                    method = importSourceClass.getMethod("valExcelData");
-                    try {
-                        valErrorInfo = (String) method.invoke(obj);
-                    } catch (Exception e) {
-                        //验证出错返回错误信息
-                        params = new HashMap<>();
-                        params.put("pId", this.pId);
-                        params.put("lineNum", (i + 2));
-                        params.put("relatedName", this.getRelatedName(obj));
-                        params.put("msg", importSourceName + "第" + (i + 2) + "行数据，验证失败！");
-                        params.put("status", "0");
-                        importLogService.saveImportDeitalLog(params, user);
-                        continue;
-                    }
-                    if (valErrorInfo.length() == 0) {
-                        /*如果是常用组的导入，并且导入类型是覆盖，则需要先删除原有的数据*/
-                        if (this.importType.equals("group") && this.operateType.equals("cover")) {
-                            method = importSourceClass.getMethod("setOperateType", String.class);
-                            method.invoke(obj, this.operateType);
-                            method = importSourceClass.getMethod("getId");
-                            int temp = (int) method.invoke(obj);
-
-                            if (!deletedGroupId.contains(temp)) {
-                                method = importSourceClass.getMethod("deleteOldData");
-                                method.invoke(obj);
-
-                                deletedGroupId.add(temp);
-                            }
-                        } else if (this.importType.equals("groupMember") && this.operateType.equals("cover")) {
-                            /*如果是常用组成员的导入，并且导入类型是覆盖，则需要先删除原有的数据*/
-                            method = importSourceClass.getMethod("setOperateType", String.class);
-                            method.invoke(obj, this.operateType);
-                            if (!this.isDeleted) {
-                                method = importSourceClass.getMethod("deleteOldData");
-                                method.invoke(obj);
-                                this.isDeleted = true;
-                            }
-                        }
-                        method = importSourceClass.getMethod("save");
-                        flag = (String) method.invoke(obj);
-                        params = new HashMap<>();
-                        params.put("pId", this.pId);
-                        params.put("lineNum", (i + 2));
-                        params.put("relatedName", this.getRelatedName(obj));
-                        String msg = importSourceName + "第" + (i + 2) + "行数据，" + this.getRelatedName(obj);
-                        if (this.importType.equals("company")) {
-                            method = importSourceClass.getMethod("getMessage");
-                            msg += (String) method.invoke(obj);
-                        }
-                        params.put("msg", flag.equals("true") ? msg + "导入成功" : msg + "导入失败");
-                        params.put("status", flag.equals("true") ? "1" : "0");
-                        importLogService.saveImportDeitalLog(params, user);
-                    } else {
-                        //验证出错返回错误信息
-                        params = new HashMap<>();
-                        params.put("pId", this.pId);
-                        params.put("lineNum", (i + 2));
-                        params.put("relatedName", this.getRelatedName(obj));
-                        params.put("msg", importSourceName + "第" + (i + 2) + "行数据，" + valErrorInfo);
-                        params.put("status", "0");
-                        importLogService.saveImportDeitalLog(params, user);
-                    }
-                }
-                //加载缓存
-                method = importSourceClass.getMethod("removeCache");
-                if (obj != null) method.invoke(obj);
-
-                if (!this.importType.equals("resourcedetial")) {
-                    params = new HashMap<>();
-                    params.put("pId", this.pId);
-                    params.put("status", "over");
-                    importLogService.saveImportLogStatus(params, user);
-                }
-            }
-
-            if (this.importType.equals("resourcedetial")) {
-                //导入基本信息自定义明细字段
-                HrmResourceDefineDetialE9 HrmResourceDefineDetialE9 = new HrmResourceDefineDetialE9();
-                HrmResourceDefineDetialE9.importXls(workbook, this.pId, user);
-                params = new HashMap<>();
-                params.put("pId", this.pId);
-                params.put("status", "over");
-                importLogService.saveImportLogStatus(params, user);
-            }
-
-        } catch (FileNotFoundException e) {
-            params = new HashMap<>();
-            params.put("pId", this.pId);
-            params.put("status", "error");
-            importLogService.saveImportLogStatus(params, user);
-        } catch (IOException e) {
-            this.errorInfo.add(SystemEnv.getHtmlLabelName(83618, userLanguage));
-            new BaseBean().writeLog(e);
-            params = new HashMap<>();
-            params.put("pId", this.pId);
-            params.put("status", "error");
-            importLogService.saveImportLogStatus(params, user);
-        } catch (IndexOutOfBoundsException e) {
-            new BaseBean().writeLog("岗位导入的报错1。。。。");
-            this.errorInfo.add(SystemEnv.getHtmlLabelName(125871, userLanguage));
-            new BaseBean().writeLog(e);
-            params = new HashMap<>();
-            params.put("pId", this.pId);
-            params.put("status", "error");
-            importLogService.saveImportLogStatus(params, user);
-        } catch (Exception e) {
-            new BaseBean().writeLog("岗位导入的报错2。。。。");
-            new BaseBean().writeLog(e);
-            this.errorInfo.add(SystemEnv.getHtmlLabelName(125871, userLanguage));
-            params = new HashMap<>();
-            params.put("pId", this.pId);
-            params.put("status", "error");
-            importLogService.saveImportLogStatus(params, user);
-        }
-        return this.errorInfo;
-    }
-
-    /**
-     * 校验模板有效性
-     *
-     * @param importSourceFieldName 导入文件名称
-     */
-    public String valExcelTemp(String importSourceFieldName) {
-        String valExcelTempInfo = "";
-        HSSFRow row;
-        HSSFCell cell;
-        String cellValue;
-        try {
-            String[] fieldname = importSourceFieldName.split(",");
-            if (this.importType.equals("group")) {
-                if (this.keyField.equals("workcode")) {
-                    fieldname[3] = "成员编号[必填]";
-                }
-            }
-            row = sheet.getRow(0);
-            for (int cellIndex = 0; cellIndex < row.getLastCellNum(); cellIndex++) {
-                cell = row.getCell((short) cellIndex);
-                if (cell == null) continue;
-                cellValue = getCellValue(cell).trim();
-                if (!fieldname[cellIndex].equals(cellValue)) {
-                    valExcelTempInfo = SystemEnv.getHtmlLabelName(387156, user.getLanguage());
-                    break;
-                }
-            }
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-            valExcelTempInfo = SystemEnv.getHtmlLabelName(387156, user.getLanguage()) + "1";
-        }
-
-        return valExcelTempInfo;
-    }
-
-    /**
-     * 读excel文件内容
-     */
-    public void readexcel() {
-        try {
-            HSSFRow row;
-            HSSFCell cell;
-            String cellValue;
-            // 行号
-            // 列号
-            int firstRow = 1;
-            lsImportSourceMap.clear();
-            int lastRow = sheet.getLastRowNum();
-            for (int i = firstRow; i <= lastRow; i++) {
-                row = sheet.getRow(i);
-                if (row == null) {
-                    errorInfo.add(SystemEnv.getHtmlLabelName(15323, userLanguage) + " " + (i + 1) + " " + SystemEnv.getHtmlLabelName(83622, userLanguage));
-                    continue;
-                }
-
-                Object obj = importSourceClass.newInstance();
-                for (int cellIndex = 0; cellIndex < row.getLastCellNum(); cellIndex++) {
-                    cell = row.getCell((short) cellIndex);
-                    if (cell == null) continue;
-                    cellValue = getCellValue(cell).trim();
-                    setImportSourceValue(cellIndex, cellValue, obj, null);
-                }
-                switch (this.importType) {
-                    case "group":
-                        ((HrmGroup) obj).setKeyField(this.keyField);
-                        ((HrmGroup) obj).setOwner(this.creator);
-                        ((HrmGroup) obj).setOperateType(this.operateType);
-                        break;
-                    case "groupMember":
-                        ((HrmGroupMember) obj).setKeyField(this.keyField);
-                        break;
-                    case "sensitiveword":
-                        ((SensitiveWord) obj).setCreater(this.creator);
-                        break;
-                }
-                lsImportSourceMap.add(obj);
-            }
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-        }
-    }
-
-    /**
-     * 获取excel单元格值
-     *
-     * @param cell 要读取的单元格对象
-     */
-    public String getCellValue(HSSFCell cell) {
-        String cellValue = "";
-        if (cell == null)
-            return "";
-        switch (cell.getCellType()) {
-            case BOOLEAN: // 得到Boolean对象的方法
-                cellValue = String.valueOf(cell.getBooleanCellValue());
-                break;
-            case NUMERIC:
-                cellValue = getString(HSSFDateUtil.isCellDateFormatted(cell), cell.getDateCellValue(), cell.getNumericCellValue());
-                break;
-            case FORMULA: // 读取公式
-                cellValue = cell.getCellFormula();
-                break;
-            case STRING: // 读取String
-                cellValue = cell.getStringCellValue();
-                break;
-        }
-        cellValue = Util.toHtmlForHrm(cellValue);
-        return cellValue;
-    }
-
-    @NotNull
-    public static String getString(boolean cellDateFormatted, Date dateCellValue, double numericCellValue) {
-        String cellValue;
-        if (cellDateFormatted) {// 先看是否是日期格式
-            SimpleDateFormat sft = new SimpleDateFormat("yyyy-MM-dd");
-            cellValue = sft.format(dateCellValue); // 读取日期格式
-        } else {
-            cellValue = String.valueOf(new Double(numericCellValue)); // 读取数字
-            if (cellValue.endsWith(".0"))
-                cellValue = cellValue.substring(0, cellValue.indexOf("."));
-        }
-        return cellValue;
-    }
-
-    /**
-     * 通过反射为对象赋值
-     *
-     * @param cellNum         列号
-     * @param cellValue       单元格值
-     * @param importSourceObj 需要赋值的
-     */
-    public void setImportSourceValue(int cellNum, String cellValue, Object importSourceObj, String field) {
-        if (field == null) {
-            String excelField = voFields[cellNum];
-            String methodName = "set" + excelField.substring(0, 1).toUpperCase() + excelField.substring(1);
-            Method method = parameterTypes.get(methodName);
-            try {
-                String fieldType = fieldTypes.get(excelField);
-                if (fieldType.equals("java.lang.String"))
-                    method.invoke(importSourceObj, cellValue);
-                else if (fieldType.equals("java.lang.Integer") && !cellValue.equals("")) {
-                    method.invoke(importSourceObj, Integer.parseInt(cellValue));
-                } else if (fieldType.equals("java.lang.Float") && !cellValue.equals(""))
-                    method.invoke(importSourceObj, Float.parseFloat(cellValue));
-                else if (fieldType.equals("java.lang.Short") && !cellValue.equals("")) {
-                    method.invoke(importSourceObj, Short.parseShort(cellValue));
-                }
-            } catch (Exception e) {
-                new BaseBean().writeLog(e);
-            }
-        } else {
-            String methodName = "set" + field.substring(0, 1).toUpperCase() + field.substring(1);
-            Method method = parameterTypes.get(methodName);
-            try {
-                method.invoke(importSourceObj, cellValue);
-            } catch (Exception e) {
-                new BaseBean().writeLog(e);
-            }
-        }
-    }
-
-    /**
-     * 初始化反射所需要的方法和字段Map，parameterTypes，fieldTypes
-     */
-    public void initReflectParam() {
-        try {
-            parameterTypes.clear();
-            fieldTypes.clear();
-            Method[] hrmResourceMethods = importSourceClass.getDeclaredMethods();
-            for (Method hrmResourceMethod : hrmResourceMethods) {
-                parameterTypes.put(hrmResourceMethod.getName(), hrmResourceMethod);
-            }
-            Field[] importSourceFields = importSourceClass.getDeclaredFields();
-            for (Field importSourceField : importSourceFields) {
-                Class<?> fieldTypeClass = importSourceField.getType();
-                if (fieldTypeClass == Integer.TYPE) {
-                    fieldTypeClass = Integer.class;
-                }
-                fieldTypes.put(importSourceField.getName(), fieldTypeClass.getName());
-            }
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-        }
-    }
-
-
-    private String getRelatedName(Object obj) {
-        String relatedName = "";
-        try {
-            switch (this.importType) {
-                case "company": {
-                    Method method = importSourceClass.getMethod("getSubcompanyname");
-                    relatedName = Util.null2String(method.invoke(obj));
-                    method = importSourceClass.getMethod("getDepartmentname");
-                    String departmentname = Util.null2String(method.invoke(obj));
-                    if (departmentname.length() > 0) {
-                        relatedName += ">";
-                    }
-                    relatedName += departmentname;
-                    break;
-                }
-                case "loaction": {
-                    Method method = importSourceClass.getMethod("getLocationname");
-                    relatedName = Util.null2String(method.invoke(obj));
-                    break;
-                }
-                case "jobtitle": {
-                    Method method = importSourceClass.getMethod("setJobtitlemark");
-                    relatedName = Util.null2String(method.invoke(obj));
-                    break;
-                }
-                case "group": {
-                    Method method = importSourceClass.getMethod("getGroupname");
-                    relatedName = Util.null2String(method.invoke(obj));
-                    break;
-                }
-                case "city":
-                case "special": {
-                    Method method = importSourceClass.getMethod("getName");
-                    relatedName = Util.null2String(method.invoke(obj));
-                    break;
-                }
-                case "area": {
-                    Method method = importSourceClass.getMethod("getCountryname");
-                    relatedName = Util.null2String(method.invoke(obj));
-                    break;
-                }
-                case "resourcedetial": {
-                    Method method = importSourceClass.getMethod("getLastname");
-                    relatedName = Util.null2String(method.invoke(obj));
-                    break;
-                }
-                case "sensitiveword": {
-                    Method method = importSourceClass.getMethod("getWord");
-                    relatedName = Util.null2String(method.invoke(obj));
-                    break;
-                }
-            }
-
-        } catch (Exception e) {
-            new BaseBean().writeLog(e);
-        }
-        return relatedName;
-    }
-}
diff --git a/src/com/engine/organization/web/ImportCommonController.java b/src/com/engine/organization/web/ImportCommonController.java
index cea8e702..08b0b10f 100644
--- a/src/com/engine/organization/web/ImportCommonController.java
+++ b/src/com/engine/organization/web/ImportCommonController.java
@@ -28,19 +28,6 @@ public class ImportCommonController {
         return ServiceUtil.getService(ImportCommonWrapper.class, user);
     }
 
-    @POST
-    @Path("/saveImportResource")
-    @Produces(MediaType.APPLICATION_JSON)
-    public ReturnResult saveImportResource(@Context HttpServletRequest request, @Context HttpServletResponse response) {
-        try {
-            User user = HrmUserVarify.getUser(request, response);
-            Map<String, Object> map = ParamUtil.request2Map(request);
-            return ReturnResult.successed(getImportCommonWrapper(user).saveImportResource(map, request));
-        } catch (Exception e) {
-            return ReturnResult.exceptionHandle(e);
-        }
-    }
-
     @GET
     @Path("/getImportFields")
     @Produces(MediaType.APPLICATION_JSON)
diff --git a/src/com/engine/organization/wrapper/ImportCommonWrapper.java b/src/com/engine/organization/wrapper/ImportCommonWrapper.java
index a42e234f..3ad9d49d 100644
--- a/src/com/engine/organization/wrapper/ImportCommonWrapper.java
+++ b/src/com/engine/organization/wrapper/ImportCommonWrapper.java
@@ -20,10 +20,6 @@ public class ImportCommonWrapper extends Service {
         return ServiceUtil.getService(ImportCommonServiceImpl.class, user);
     }
 
-    public Map<String, Object> saveImportResource(Map<String, Object> params, HttpServletRequest request) {
-        return getImportCommonService(user).saveImportResource(params, request);
-    }
-
 
     /**
      * 选择导入字段