From 0128de79ea3f75c834434884d570fad0f7e4b0d1 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Mon, 19 Dec 2022 19:24:28 +0800
Subject: [PATCH 1/2] =?UTF-8?q?oracle=E7=8E=AF=E5=A2=83=E5=AD=98=E5=85=A5?=
 =?UTF-8?q?=E7=89=88=E6=9C=ACbug=E4=BF=AE=E5=A4=8D=E3=80=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=81=8C=E7=AD=89=E8=81=8C=E7=BA=A71219?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/jclorgmap/JclOrgMapper.xml         | 66 ++++++++++++-------
 .../impl/VersionManageServiceImpl.java        |  4 +-
 2 files changed, 44 insertions(+), 26 deletions(-)

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

From 30898d0eee17cdbc6cf7a21806c2a27dbeead4b9 Mon Sep 17 00:00:00 2001
From: Mlin <ml123456>
Date: Tue, 20 Dec 2022 09:02:51 +0800
Subject: [PATCH 2/2] =?UTF-8?q?oracle=E7=8E=AF=E5=A2=83=E5=AD=98=E5=85=A5?=
 =?UTF-8?q?=E7=89=88=E6=9C=ACbug=E4=BF=AE=E5=A4=8D=E3=80=81=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=81=8C=E7=AD=89=E8=81=8C=E7=BA=A71220?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/version/HrmDepartmentVersion.java  |  4 +
 .../entity/version/HrmResourceVersion.java    |  4 +
 .../entity/version/HrmSubCompanyVersion.java  |  2 +
 .../mapper/version/CompanyVersionMapper.xml   | 83 +++++++++----------
 .../service/impl/OrgChartServiceImpl.java     |  2 +-
 .../impl/VersionManageServiceImpl.java        | 15 ++--
 6 files changed, 58 insertions(+), 52 deletions(-)

diff --git a/src/com/engine/organization/entity/version/HrmDepartmentVersion.java b/src/com/engine/organization/entity/version/HrmDepartmentVersion.java
index e16cde7a..740fc704 100644
--- a/src/com/engine/organization/entity/version/HrmDepartmentVersion.java
+++ b/src/com/engine/organization/entity/version/HrmDepartmentVersion.java
@@ -21,4 +21,8 @@ public class HrmDepartmentVersion {
     String operator;
     Double version;
     Date operateTime;
+
+    String subcompanyname;
+    String supDepName;
+    String bmfzrName;
 }
diff --git a/src/com/engine/organization/entity/version/HrmResourceVersion.java b/src/com/engine/organization/entity/version/HrmResourceVersion.java
index 618df54c..37e149af 100644
--- a/src/com/engine/organization/entity/version/HrmResourceVersion.java
+++ b/src/com/engine/organization/entity/version/HrmResourceVersion.java
@@ -159,4 +159,8 @@ public class HrmResourceVersion {
 
     private Date operateTime;
 
+    String departmentname;
+    String subcompanyname;
+    String jobtitlename;
+
 }
diff --git a/src/com/engine/organization/entity/version/HrmSubCompanyVersion.java b/src/com/engine/organization/entity/version/HrmSubCompanyVersion.java
index a9a1701d..c9524ecc 100644
--- a/src/com/engine/organization/entity/version/HrmSubCompanyVersion.java
+++ b/src/com/engine/organization/entity/version/HrmSubCompanyVersion.java
@@ -19,4 +19,6 @@ public class HrmSubCompanyVersion {
     String operator;
     Double version;
     Date operateTime;
+
+    String supSubComName;
 }
diff --git a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
index 79574162..1ab42fb7 100644
--- a/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
+++ b/src/com/engine/organization/mapper/version/CompanyVersionMapper.xml
@@ -234,79 +234,76 @@
 
 
     <select id="getHrmSubComp" resultType="com.engine.organization.entity.version.HrmSubCompanyDto">
-        select id ,subcompanyname, subcompanydesc,companyid,supsubcomid,url,canceled,subcompanycode,outkey,showorder from HrmSubCompany
+        select id ,subcompanyname, subcompanydesc,companyid,supsubcomid,canceled,subcompanycode,showorder from HrmSubCompany
         where id=#{id}
     </select>
     <select id="getHrmDepartment" resultType="com.engine.organization.entity.version.HrmDepartmentDto">
-        select id,departmentmark,departmentname,subcompanyid1,supdepid,canceled,departmentcode,outkey,showorder,coadjutant,bmfzr from HrmDepartment
-        where id=#{id}
+        select a.id,a.departmentmark,a.departmentname,a.subcompanyid1,a.supdepid,a.canceled,
+               a.departmentcode,a.showorder,b.bmfzr from HrmDepartment a
+               left join hrmdepartmentdefined b on a.id=b.deptid
+        where a.id=#{id}
     </select>
     <select id="getHrmResource" resultType="com.engine.organization.entity.version.HrmResourceDto">
-        select id,loginid,password,lastname,sex,birthday,nationality,systemlanguage,
-               maritalstatus,telephone,mobile,mobilecall,email,locationid,workroom,homeaddress,
-               resourcetype,startdate,enddate,jobtitle,jobactivitydesc,joblevel,seclevel,departmentid,
-               subcompanyid1,costcenterid,managerid,assistantid,bankid1,accountid1,resourceimageid,createrid,
-               createdate,lastmodid,lastmoddate,lastlogindate,datefield1,datefield2,datefield3,datefield4,
-               datefield5,numberfield1,numberfield2,numberfield3,numberfield4,numberfield5,textfield1,textfield2,
-               textfield3,textfield4,textfield5,tinyintfield1,tinyintfield2,tinyintfield3,tinyintfield4,
-               tinyintfield5,certificatenum,nativeplace,educationlevel,bememberdate,bepartydate,workcode,
-               regresidentplace,healthinfo,residentplace,policy,degree,height,usekind,jobcall,accumfundaccount,
-               birthplace,folk,residentphone,residentpostcode,extphone,managerstr,status,fax,islabouunion,weight,
-               tempresidentnumber,probationenddate,countryid,passwdchgdate,needusb,serial,account,lloginid,
-               needdynapass,dsporder,passwordstate,accounttype,belongto,dactylogram,assistantdactylogram,
-               passwordlock,sumpasswordwrong,oldpassword1,oldpassword2,msgStyle,messagerurl,pinyinlastname,
-               tokenkey,userUsbType,outkey,adsjgs,adgs,adbm,mobileshowtype,usbstate,totalSpace,occupySpace,
-               ecology_pinyin_search,isADAccount,accountname,
-               haschangepwd,created,creater,modified,modifier,passwordlocktime,mobilecaflag,salt,companystartdate,
-               workstartdate,secondaryPwd,useSecondaryPwd,classification,uuid,passwordLockReason,companyworkyear,
-               workyear,DISMISSDATE,encKey,crc,usbscope,tenant_key,clauthtype,hashData,signData from HrmResource
+        select id,departmentid,dsporder,subcompanyid1,jobtitle,mobile,telephone,managerid,lastname from HrmResource
         where id=#{id}
     </select>
 
     <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
+        select a.id,a.subComId,a.subCompanyDesc,a.subCompanyCode,a.subCompanyName,a.supSubComId,a.showOrder,a.canceled,
+        a.description,a.operator,a.version,a.operate_time as operateTime,b.subcompanyname as supSubComName from HRMSUBCOMPANY_VERSION a
+               left join hrmsubcompany b on a.supSubComId=b.id
         <where>
             <if test="subComId !=null">
-                and subComId = #{subComId}
+                and a.subComId = #{subComId}
             </if>
             <if test="version !=null">
-                and version like #{version}
+                and a.version like #{version}
             </if>
         </where>
-        ORDER BY VERSION ASC
+        ORDER BY a.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
+        select a.id,a.departmentid,a.departmentmark,a.departmentcode,a.departmentname,a.subcompanyid1,
+        a.supdepid,a.bmfzr,a.showorder,a.canceled,a.description,a.operator,a.version,
+        a.operate_time as operateTime,b.subcompanyname,c.departmentname as supDepName,d.lastname as bmfzrName from HRMDEPARTMENT_VERSION a
+        left join hrmsubcompany b on a.subcompanyid1=b.id
+        left join hrmdepartment c on a.supdepid=c.id
+        left join hrmresource d on a.bmfzr=d.id
         <where>
             <if test="departmentid !=null">
-                and departmentid = #{departmentid}
+                and a.departmentid = #{departmentid}
             </if>
             <if test="version !=null">
-                and version like #{version}
+                and a.version like #{version}
             </if>
         </where>
-        ORDER BY VERSION ASC
+        ORDER BY a.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 from HRMRESOURCE_VERSION
+        select a.id,a.resourceid,a.companystartdate,a.companyworkyear,a.workstartdate,a.workyear,a.usekind,
+        a.jobcall,a.accumfundaccount,a.birthplace,a.folk,a.residentphone,a.residentpostcode,a.extphone,
+        a.managerstr,a.status,a.fax,a.islabouunion,a.weight,a.tempresidentnumber,a.probationenddate,
+        a.countryid,a.passwdchgdate,a.lloginid,a.dsporder,a.passwordstate,a.accounttype,a.belongto,
+        a.messagerurl,a.accountname,a.loginid,a.password,a.lastname,a.sex,a.birthday,a.nationality,
+        a.maritalstatus,a.telephone,a.mobile,a.mobilecall,a.email,a.locationid,a.workroom,a.homeaddress,
+        a.resourcetype,a.startdate,a.enddate,a.jobtitle,a.jobactivitydesc,a.joblevel,a.seclevel,
+        a.departmentid,a.subcompanyid1,a.costcenterid,a.managerid,a.assistantid,a.bankid1,a.accountid1,
+        a.resourceimageid,a.certificatenum,a.nativeplace,a.educationlevel,a.bememberdate,a.bepartydate,
+        a.workcode,a.regresidentplace,a.healthinfo,a.residentplace,a.policy,a.degree,a.height,a.classification,
+        a.description,a.operator,a.version,a.operate_time as operateTime,b.departmentname,c.subcompanyname,
+        d.jobtitlename
+        from HRMRESOURCE_VERSION a
+        left join hrmdepartment b on a.departmentid=b.id
+        left join hrmsubcompany c on a.subcompanyid1=c.id
+        left join hrmjobtitles d on a.jobtitle=d.id
         <where>
             <if test="resourceid !=null">
-                and resourceid = #{resourceid}
+                and a.resourceid = #{resourceid}
             </if>
             <if test="version !=null">
-                and version like #{version}
+                and a.version like #{version}
             </if>
         </where>
-        ORDER BY VERSION ASC
+        ORDER BY a.VERSION ASC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
index 795487d6..a3876982 100644
--- a/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
+++ b/src/com/engine/organization/service/impl/OrgChartServiceImpl.java
@@ -558,7 +558,7 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
         String ftype = null;
         if (rs.next()) {
             fparentid = rs.getString("fparentid");
-            String typeSql = "select ftype from jcl_org_map where id=" + fparentid + " ";
+            String typeSql = "select ftype from jcl_org_map where id=" + fparentid + whereSql;
             rs.executeQuery(typeSql + whereSql);
             if (rs.next()) {
                 ftype = rs.getString("ftype");
diff --git a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
index 743176f9..87c88a3d 100644
--- a/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
+++ b/src/com/engine/organization/service/impl/VersionManageServiceImpl.java
@@ -94,7 +94,7 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                 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(hrmSubCompanyVersion.getSupSubComName())).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());
@@ -122,10 +122,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                     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(hrmDepartmentVersion.getSubcompanyname())).build());
+                    datas.add(VersionData.builder().fieldId("上级部门").fieldValue(Util.null2String(hrmDepartmentVersion.getSupDepName())).build());
+                    datas.add(VersionData.builder().fieldId("部门负责人").fieldValue(Util.null2String(hrmDepartmentVersion.getBmfzrName())).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());
                     operateName = hrmDepartmentVersion.getOperator();
@@ -150,9 +149,9 @@ public class VersionManageServiceImpl extends Service implements VersionManageSe
                 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(hrmResourceVersion.getDepartmentname())).build());
+                    datas.add(VersionData.builder().fieldId("岗位").fieldValue(Util.null2String(hrmResourceVersion.getJobtitlename())).build());
+                    datas.add(VersionData.builder().fieldId("分部").fieldValue(Util.null2String(hrmResourceVersion.getSubcompanyname())).build());
                     datas.add(VersionData.builder().fieldId("版本号").fieldValue(Util.null2String(String.format("%.1f", hrmResourceVersion.getVersion()))).build());
                     operateName = hrmResourceVersion.getOperator();
                     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");