diff --git a/src/com/engine/organization/entity/version/VersionData.java b/src/com/engine/organization/entity/version/VersionData.java
new file mode 100644
index 00000000..a6d31888
--- /dev/null
+++ b/src/com/engine/organization/entity/version/VersionData.java
@@ -0,0 +1,15 @@
+package com.engine.organization.entity.version;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+public class VersionData {
+    private String fieldId;
+    private String fieldValue;
+}
diff --git a/src/com/engine/organization/mapper/version/CompanyVersionMapper.java b/src/com/engine/organization/mapper/version/CompanyVersionMapper.java
index c35b2bda..f13386ee 100644
--- a/src/com/engine/organization/mapper/version/CompanyVersionMapper.java
+++ b/src/com/engine/organization/mapper/version/CompanyVersionMapper.java
@@ -70,5 +70,17 @@ public interface CompanyVersionMapper {
     /**
      * 获取分部版本记录
      */
-    List<HrmSubCompanyVersion> getSubComVersionList(@Param("operateName") String operateName,@Param("operateTime") String operateTime,@Param("subComId") String subComId,@Param("id") String id);
+    List<HrmSubCompanyVersion> getSubComVersionList(@Param("subComId") String subComId,@Param("version") String version);
+
+    /**
+     * 获取部门版本记录
+     */
+    List<HrmDepartmentVersion> getDeptVersionList(@Param("departmentid") String departmentid,@Param("version") String version);
+
+
+    /**
+     * 获取人员版本记录
+     */
+    List<HrmResourceVersion> getResourceVersionList(@Param("departmentid") String departmentid,@Param("version") String version);
+
 }
diff --git a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
index 0e83d20e..db94f366 100644
--- a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
+++ b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
@@ -264,21 +264,48 @@
         where id=#{id}
     </select>
 
-    <select id="getSubComVersionList" resultType="com.engine.organization.entity.version.HrmSubCompanyVersion" databaseId="sqlserver">
+    <select id="getSubComVersionList" resultType="com.engine.organization.entity.version.HrmSubCompanyVersion">
         select id,subComId,subCompanyDesc,subCompanyCode,subCompanyName,supSubComId,showOrder,canceled,
                description,operator,version,operate_time as operateTime from HRMSUBCOMPANY_VERSION
         <where>
-            <if test="operateName !=null">
-                and operator = #{operateName}
-            </if>
             <if test="subComId !=null">
                 and subComId = #{subComId}
             </if>
-            <if test="operateTime !=null">
-                and convert(varchar(100),operate_time,23) = #{operateTime}
+            <if test="version !=null">
+                and version like #{version}
+            </if>
+        </where>
+        ORDER BY VERSION ASC
+    </select>
+    <select id="getDeptVersionList" resultType="com.engine.organization.entity.version.HrmDepartmentVersion">
+        select id,departmentid,departmentmark,departmentcode,departmentname,subcompanyid1,supdepid,bmfzr,showorder,
+                       canceled,description,operator,version,operate_time as operateTime from HRMDEPARTMENT_VERSION
+        <where>
+            <if test="departmentid !=null">
+                and departmentid = #{departmentid}
+            </if>
+            <if test="version !=null">
+                and version like #{version}
+            </if>
+        </where>
+        ORDER BY VERSION ASC
+    </select>
+    <select id="getResourceVersionList" resultType="com.engine.organization.entity.version.HrmResourceVersion">
+        select id,resourceid,companystartdate,companyworkyear,workstartdate,workyear,usekind,jobcall,accumfundaccount,
+               birthplace,folk,residentphone,residentpostcode,extphone,managerstr,status,fax,islabouunion,weight,
+               tempresidentnumber,probationenddate,countryid,passwdchgdate,lloginid,dsporder,passwordstate,accounttype,
+               belongto,messagerurl,accountname,loginid,password,lastname,sex,birthday,nationality,maritalstatus,
+               telephone,mobile,mobilecall,email,locationid,workroom,homeaddress,resourcetype,startdate,enddate,
+               jobtitle,jobactivitydesc,joblevel,seclevel,departmentid,subcompanyid1,costcenterid,managerid,assistantid,
+               bankid1,accountid1,resourceimageid,certificatenum,nativeplace,educationlevel,bememberdate,bepartydate,
+               workcode,regresidentplace,healthinfo,residentplace,policy,degree,height,classification,description,
+               operator,version,operate_time as operateTime as operateTime from HRMRESOURCE_VERSION
+        <where>
+            <if test="resourceid !=null">
+                and resourceid = #{resourceid}
             </if>
-            <if test="id !=null">
-                and id = #{id}
+            <if test="version !=null">
+                and version like #{version}
             </if>
         </where>
         ORDER BY VERSION ASC
diff --git a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
index 4046df73..b49e05b2 100644
--- a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
+++ b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
@@ -8,6 +8,7 @@ import com.engine.organization.entity.map.JclOrgMap;
 import com.engine.organization.entity.version.HrmDepartmentVersion;
 import com.engine.organization.entity.version.HrmResourceVersion;
 import com.engine.organization.entity.version.HrmSubCompanyVersion;
+import com.engine.organization.entity.version.VersionData;
 import com.engine.organization.enums.ModuleTypeEnum;
 import com.engine.organization.mapper.jclorgmap.JclOrgMapper;
 import com.engine.organization.mapper.resource.ResourceMapper;
@@ -72,40 +73,90 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
     public Map<String, Object> getVersion(ModuleTypeEnum moduleTypeEnum, Map<String, Object> params, User user) {
         String operateName = user.getUsername();
         String id = (String) params.get("id");
-        String supComId = (String) params.get("subComId");
-        String operateTime = OrganizationDateUtil.getFormatLocalDate(new java.util.Date());
+        String version = (String) params.get("version");
+        String operateTime = null;
         Map<String,Object> resultMap = new HashMap<>();
+        List versions = new ArrayList<>();
+        List<VersionData> datas = new ArrayList<>();
         switch (moduleTypeEnum.getValue()){
             case 1:
-                List<HrmSubCompanyVersion> list = getCompanyVersionMapper().getSubComVersionList(operateName,operateTime,supComId,null);
-                List versions = new ArrayList<>();
-                Map<String,String> map = new HashMap<>();
-                for (int i=0;i<list.size();i++){
-                    HrmSubCompanyVersion hrmSubCompanyVersion = list.get(i);
-                    String value = "value" + i;
-                    map.put(value,  String.format("%.1f", hrmSubCompanyVersion.getVersion()));
+                List<HrmSubCompanyVersion> list = getCompanyVersionMapper().getSubComVersionList(id,null);
+
+                int size = list.size();
+                for (HrmSubCompanyVersion hrmSubCompanyVersion:list){
+                    Map<String,String> map = new HashMap<>();
+                    map.put("value",  String.format("%.1f", hrmSubCompanyVersion.getVersion()));
+                    versions.add(map);
+                }
+                if (StringUtils.isBlank(version)){
+                    size = size>1 ? size-1:size;
+                    version = String.format("%.1f",list.get(size-1).getVersion());
+                }
+                list = getCompanyVersionMapper().getSubComVersionList(id,version);
+                for (HrmSubCompanyVersion hrmSubCompanyVersion:list){
+                    datas.add(VersionData.builder().fieldId("分部简称").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyName())).build());
+                    datas.add(VersionData.builder().fieldId("分部描述").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyDesc())).build());
+                    datas.add(VersionData.builder().fieldId("上级分部id").fieldValue(Util.null2String(hrmSubCompanyVersion.getSupSubComId())).build());
+                    datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f",hrmSubCompanyVersion.getVersion()))).build());
+                    datas.add(VersionData.builder().fieldId("分部编码").fieldValue(Util.null2String(hrmSubCompanyVersion.getSubCompanyCode())).build());
+                    datas.add(VersionData.builder().fieldId("排序").fieldValue(Util.null2String(hrmSubCompanyVersion.getShowOrder())).build());
+                    operateName = hrmSubCompanyVersion.getOperator();
+                    operateTime = OrganizationDateUtil.getFormatLocalDate(hrmSubCompanyVersion.getOperateTime());
                 }
-                versions.add(map);
-                List<HrmSubCompanyVersion> list2 = getCompanyVersionMapper().getSubComVersionList(operateName,operateTime,supComId,id);
-//                List datas = new ArrayList<>();
-//                Map<String,String> map2 = new HashMap<>();
-//                for (HrmSubCompanyVersion hrmSubCompanyVersion:list){
-//                    map2.put("fieldId", String.valueOf(hrmSubCompanyVersion.getVersion()));
-//                    map2.put("fieldValue", String.valueOf(hrmSubCompanyVersion.getVersion()));
-//                    versions.add(map);
-//                }
-                resultMap.put("operateName",operateName);
-                resultMap.put("operateTime",operateTime);
-                resultMap.put("versions",versions);
-                resultMap.put("datas",list2);
                 break;
             case 2:
+                List<HrmDepartmentVersion> deptVersionList = getCompanyVersionMapper().getDeptVersionList(id,null);
+                int deptSize = deptVersionList.size();
+                for (HrmDepartmentVersion hrmDepartmentVersion:deptVersionList){
+                    Map<String,String> map = new HashMap<>();
+                    map.put("value",  String.format("%.1f", hrmDepartmentVersion.getVersion()));
+                    versions.add(map);
+                }
+                if (StringUtils.isBlank(version)){
+                    deptSize = deptSize>1 ? deptSize-1:deptSize;
+                    version = String.format("%.1f",deptVersionList.get(deptSize).getVersion());
+                }
+                deptVersionList = getCompanyVersionMapper().getDeptVersionList(id,version);
+                for (HrmDepartmentVersion hrmDepartmentVersion:deptVersionList){
+                    datas.add(VersionData.builder().fieldId("部门编号").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentCode())).build());
+                    datas.add(VersionData.builder().fieldId("部门简称").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentName())).build());
+                    datas.add(VersionData.builder().fieldId("部门标识").fieldValue(Util.null2String(hrmDepartmentVersion.getDepartmentMark())).build());
+                    datas.add(VersionData.builder().fieldId("所属分部").fieldValue(Util.null2String(hrmDepartmentVersion.getSubCompanyId1())).build());
+                    datas.add(VersionData.builder().fieldId("上级部门").fieldValue(Util.null2String(hrmDepartmentVersion.getSupDepId())).build());
+                    datas.add(VersionData.builder().fieldId("上级部门").fieldValue(Util.null2String(hrmDepartmentVersion.getSupDepId())).build());
+                    datas.add(VersionData.builder().fieldId("部门负责人").fieldValue(Util.null2String(hrmDepartmentVersion.getBmfzr())).build());
+                    datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f",hrmDepartmentVersion.getVersion()))).build());
+                    datas.add(VersionData.builder().fieldId("排序").fieldValue(Util.null2String(hrmDepartmentVersion.getShowOrder())).build());
+                }
                 break;
             case 4:
+                List<HrmResourceVersion> resVersionList = getCompanyVersionMapper().getResourceVersionList(id,null);
+                int resSize = resVersionList.size();
+                for (HrmResourceVersion hrmResourceVersion:resVersionList){
+                    Map<String,String> map = new HashMap<>();
+                    map.put("value",  String.format("%.1f", hrmResourceVersion.getVersion()));
+                    versions.add(map);
+                }
+                if (StringUtils.isBlank(version)){
+                    deptSize = resSize>1 ? resSize-1:resSize;
+                    version = String.format("%.1f",resVersionList.get(deptSize).getVersion());
+                }
+                resVersionList = getCompanyVersionMapper().getResourceVersionList(id,version);
+                for (HrmResourceVersion hrmResourceVersion:resVersionList){
+                    datas.add(VersionData.builder().fieldId("姓名").fieldValue(Util.null2String(hrmResourceVersion.getLastname())).build());
+                    datas.add(VersionData.builder().fieldId("部门").fieldValue(Util.null2String(hrmResourceVersion.getDepartmentid())).build());
+                    datas.add(VersionData.builder().fieldId("岗位").fieldValue(Util.null2String(hrmResourceVersion.getJobtitle())).build());
+                    datas.add(VersionData.builder().fieldId("分部").fieldValue(Util.null2String(hrmResourceVersion.getSubcompanyid1())).build());
+                    datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f",hrmResourceVersion.getVersion()))).build());
+                }
                 break;
             default:
                 break;
         }
+        resultMap.put("operateName",operateName);
+        resultMap.put("operateTime",operateTime);
+        resultMap.put("versions",versions);
+        resultMap.put("datas",datas);
         return resultMap;
     }