diff --git a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
index 69707dc8..9db63187 100644
--- a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
+++ b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml
@@ -74,8 +74,6 @@
     <select id="getJclOrgMapByType" resultType="com.engine.organization.entity.map.JclOrgMap">
         select * from jcl_org_map where ftype = #{fType} AND FDATEBEGIN &lt;= #{currentDate} AND FDATEEND &gt;= #{currentDate}
     </select>
-
-    
     <!--删除当天所有数据-->
     <delete id="deleteAllMap">
         delete from jcl_org_map where fdatebegin = #{currentDate}
@@ -95,11 +93,14 @@
         fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
         fisvitual,fdatebegin,fdateend)
         select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
-        c.id,c.jobtitlename,null,null, isnull( b.id, '' ) +200000000,b.id,
+        c.id,c.jobtitlename,e.level_name,f.grade_name, isnull( b.id, '' ) +200000000,b.id,
         0,convert(varchar(100),getDate(),23),'2099-12-31'
         from hrmresource a
         left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle
         left join HrmJobTitles c on b.ec_jobTitle = c.id
+        left join cus_fielddata d on a.id = d.id and d.scope='HrmCustomFieldByInfoType' and d.scopeid=3
+        left join jcl_org_level e on d.field3=e.id
+        left join jcl_org_grade f on d.field4=f.id
         where a.status &lt; 4
     </insert>
     <insert id="insertResToMap" databaseId="mysql">
@@ -108,11 +109,14 @@
         fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
         fisvitual,fdatebegin,fdateend)
         select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
-        c.id,c.jobtitlename,null,null, ifnull( b.id, '' ) +200000000,b.id,
+        c.id,c.jobtitlename,e.level_name,f.grade_name, ifnull( b.id, '' ) +200000000,b.id,
         0,NOW(),'2099-12-31'
         from hrmresource a
         left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle
         left join HrmJobTitles c on b.ec_jobTitle = c.id
+        left join cus_fielddata d on a.id = d.id and d.scope='HrmCustomFieldByInfoType' and d.scopeid=3
+        left join jcl_org_level e on d.field3=e.id
+        left join jcl_org_grade f on d.field4=f.id
         where a.status &lt; 4
     </insert>
     <insert id="insertResToMap" databaseId="oracle">
@@ -121,11 +125,14 @@
         fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
         fisvitual,fdatebegin,fdateend)
         select a.id+300000000,4,a.id,a.uuid,0,'行政维度',a.workcode,a.LASTNAME,a.messagerurl,
-        c.id,c.jobtitlename,null,null, nvl( b.id, '' ) +200000000,b.id,
+        c.id,c.jobtitlename,e.level_name,f.grade_name, nvl( b.id, '' ) +200000000,b.id,
         0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
         from hrmresource a
         left join jcl_org_job b ON a.JOBTITLE = b.ec_jobTitle
         left join HrmJobTitles c on b.ec_jobTitle = c.id
+        left join cus_fielddata d on a.id = d.id and d.scope='HrmCustomFieldByInfoType' and d.scopeid=3
+        left join jcl_org_level e on d.field3=e.id
+        left join jcl_org_grade f on d.field4=f.id
         where a.status &lt; 4
     </insert>
     <!--初始化岗位-->
@@ -193,15 +200,19 @@
         (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
         fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
         fplan,fonjob,fisvitual,fdatebegin,fdateend)
-        select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,cast(a.BMFZR as varchar(10)),b.messagerurl,
-        b.lastname,b.jobtitle,c.jobtitlemark,null,null,
+        select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,cast(b.BMFZR as varchar(10)),c.messagerurl,
+        c.lastname,c.jobtitle,d.jobtitlemark,f.level_name,g.grade_name,
         (case isnull(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
         (case isnull(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
         0,0,0,convert(varchar(100),getDate(),23),'2099-12-31'
         from
         HrmDepartment as a
-        left join hrmresource as b on cast(a.BMFZR as varchar(10))=cast(b.ID as varchar(10))
-        left join hrmjobtitles as c on b.JOBTITLE=c.id
+        left join hrmdepartmentdefined as b on a.id=b.deptid
+        left join hrmresource as c on cast(b.BMFZR as varchar(10))=cast(c.ID as varchar(10))
+        left join hrmjobtitles as d on c.JOBTITLE=d.id
+        left join cus_fielddata e on c.id = e.id and e.scope='HrmCustomFieldByInfoType' and e.scopeid=3
+        left join jcl_org_level f on e.field3=f.id
+        left join jcl_org_grade g on e.field4=g.id
         where isnull(a.canceled,0) &lt;&gt; 1
     </insert>
     <insert id="insertDeptToMap" databaseId="mysql">
@@ -209,31 +220,38 @@
         (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
          fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
          fplan,fonjob,fisvitual,fdatebegin,fdateend)
-        select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl,
-               b.lastname,b.jobtitle,c.jobtitlemark,null,null,
+        select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,b.BMFZR,c.messagerurl,
+               c.lastname,c.jobtitle,d.jobtitlemark,f.level_name,g.grade_name,
                (case ifnull(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
                (case ifnull(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
                0,0,0,NOW(),'2099-12-31'
         from
             HrmDepartment as a
-                left join hrmresource as b on a.BMFZR=b.ID
-                left join hrmjobtitles as c on b.JOBTITLE=c.id
+                left join hrmdepartmentdefined as b on a.id=b.deptid
+                left join hrmresource as c on b.BMFZR=c.ID
+                left join hrmjobtitles as d on c.JOBTITLE=d.id
+                left join cus_fielddata e on c.id = e.id and e.scope='HrmCustomFieldByInfoType' and e.scopeid=3
+                left join jcl_org_level f on e.field3=f.id
+                left join jcl_org_grade g on e.field4=g.id
         where ifnull(a.canceled,0) &lt;&gt; 1
     </insert>
     <insert id="insertDeptToMap" databaseId="oracle">
         insert into  jcl_org_map
         (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
-        fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
-        fplan,fonjob,fisvitual,fdatebegin,fdateend)
-        select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,a.BMFZR,b.messagerurl,
-        b.lastname,b.jobtitle,c.jobtitlemark,null,null,
-        (case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
-        (case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
-        0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
-        from
-        HrmDepartment a
-        left join hrmresource b on a.BMFZR=b.ID
-        left join hrmjobtitles c on b.JOBTITLE=c.id
+         fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
+         fplan,fonjob,fisvitual,fdatebegin,fdateend)
+        select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,to_number(b.BMFZR),c.messagerurl,
+               c.lastname,c.jobtitle,d.jobtitlemark,f.level_name,g.grade_name,
+               (case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
+               (case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
+               0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
+        from  HrmDepartment a
+        left join hrmdepartmentdefined b on a.id=b.deptid
+        left join hrmresource c on to_char(b.BMFZR)=c.ID
+        left join hrmjobtitles d on c.JOBTITLE=d.id
+        left join cus_fielddata e on c.id = e.id and e.scope='HrmCustomFieldByInfoType' and e.scopeid=3
+        left join jcl_org_level f on e.field3=f.id
+        left join jcl_org_grade g on e.field4=g.id
         where nvl(a.canceled,0) &lt;&gt; 1
     </insert>
     <!--同步分部信息-->
diff --git a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
index 66b22f70..743176f9 100644
--- a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
+++ b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
@@ -385,7 +385,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
         hrmDepartmentVersion.setDescription(null);
         hrmDepartmentVersion.setOperator(user.getLastname());
         hrmDepartmentVersion.setVersion(genVersionId(2, Util.null2String(id)));
-//        hrmDepartmentVersion.setOperateTime(new Timestamp(OrganizationDateUtil.stringToDateTime(currentDate).getTime()));
+        hrmDepartmentVersion.setOperateTime(new Timestamp(OrganizationDateUtil.stringToDateTime(currentDate).getTime()));
 
         getCompanyVersionMapper().insertHrmDeptVersion(hrmDepartmentVersion);
     }
@@ -413,7 +413,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
         hrmResourceVersion.setManagerid(StringUtils.isNotBlank(managerid) ? Integer.parseInt(managerid) : null);
         hrmResourceVersion.setLastname(hrmResourceDto.getLastname());
         hrmResourceVersion.setOperator(user.getLastname());
-//        hrmResourceVersion.setVersion(genVersionId(4, String.valueOf(id)));
+        hrmResourceVersion.setVersion(genVersionId(4, String.valueOf(id)));
         hrmResourceVersion.setOperateTime(new Timestamp(OrganizationDateUtil.stringToDateTime(currentDate).getTime()));
 
         getCompanyVersionMapper().insertHrmResourceVersion(hrmResourceVersion);