code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/init/business/SynPendingSalaryAdjDataServiceImpl.java

@@ -110,7 +110,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
         /**
          * 查询入职单
          */
-        String selectField2 = "id,billno,b_effectivedate,createtime,ba_em_tid,ba_em_empnumber,ba_em_name,ba_po_position.masterid,ba_po_adminorg,ba_po_job.id,ajoblevel.id,ba_po_job.jobseq.id";
+        String selectField2 = "id,billno,b_effectivedate,createtime,ba_em_tid,ba_em_empnumber,ba_em_name,ba_po_position.boid,ba_po_adminorg,ba_po_job.id,ajoblevel.id,ba_po_job.jobseq.id";
         QFilter qFilter1 = new QFilter("enrollstatus", QCP.equals, "3"); // 入职状态 = 已入职
         QFilter qFilter2 = new QFilter("billstatus", QCP.equals, "C"); // 单据状态 = 已审核
         QFilter qFilter3 = new QFilter("b_effectivedate", QCP.large_equals, daysAgo);
@@ -159,7 +159,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
             dyn.set("nckd_dodatetime", onhasonbrdDyn.getDate("createtime"));
             dyn.set("nckd_salaryadjus", salaryTypeDyns.get(0).getLong("id"));  //定调薪类型
             dyn.set("nckd_newhradminorg", onhasonbrdDyn.getLong("ba_po_adminorg"));  //部门
-            dyn.set("nckd_newposition", onhasonbrdDyn.getLong("ba_po_position.masterid"));  //岗位
+            dyn.set("nckd_newposition", onhasonbrdDyn.getLong("ba_po_position.boid"));  //岗位
             //dyn.set("nckd_newjobseqhr", onhasonbrdDyn.getLong("ba_po_job.jobseq.id"));  //职位序列
             dyn.set("nckd_newsalaryrank", salaryRankDyn.getLong("id"));
             onhasonbrdCount++;
@@ -170,7 +170,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
         /**
          * 查询调动单
          */
-        String selectField1 = "id,billno,b_effectivedate,createtime,bb_em_tid,ba_em_empnumber,bb_po_position.masterid,aposition.masterid,bb_po_adminorg.id,aorg.id,bb_po_job.jobseq.id,ajob.jobseq.id";
+        String selectField1 = "id,billno,b_effectivedate,createtime,bb_em_tid,ba_em_empnumber,bb_po_position.boid,aposition.boid,bb_po_adminorg.id,aorg.id,bb_po_job.jobseq.id,ajob.jobseq.id";
         QFilter qFilter12 = new QFilter("billstatus", QCP.equals, "C"); // 单据状态 = 已审核
         QFilter qFilter13 = new QFilter("b_effectivedate", QCP.large_equals, daysAgo);  //实际调动日期
         QFilter qFilter14 = new QFilter("b_effectivedate", QCP.less_equals, currentDate);  //实际调动日期
@@ -221,7 +221,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
              * 调动前
              */
             dyn.set("nckd_oldhradminorg", transferDyn.getLong("bb_po_adminorg.id"));  //部门
-            dyn.set("nckd_oldposition", transferDyn.getLong("bb_po_position.masterid"));  //岗位
+            dyn.set("nckd_oldposition", transferDyn.getLong("bb_po_position.boid"));  //岗位
             //dyn.set("nckd_oldjobseqhr", transferDyn.getLong("bb_po_job.jobseq.id"));  //职位序列
             DynamicObject adjRecordDyn  = adjRecordMap.get(employeeID);
             if(adjRecordDyn != null) {
@@ -231,7 +231,7 @@ public class SynPendingSalaryAdjDataServiceImpl implements SynPendingSalaryAdjDa
              * 调动后
              */
             dyn.set("nckd_newhradminorg", transferDyn.getLong("aorg.id"));  //部门
-            dyn.set("nckd_newposition", transferDyn.getLong("aposition.masterid"));  //岗位
+            dyn.set("nckd_newposition", transferDyn.getLong("aposition.boid"));  //岗位
             //dyn.set("nckd_newjobseqhr", transferDyn.getLong("ajob.jobseq.id"));  //职位序列
             dyn.set("nckd_newsalaryrank", salaryRankDyn.getLong("id"));   //薪档
             transferCount++;