1.MDM人员兼职处理，EMP_P_PRIMARY_KEY字段变更为取兼职档案ID

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/hrmp/hbpm/task/SyncUtil.java

@@ -420,7 +420,7 @@ public class SyncUtil {
         sb.append(" left join t_hbss_flok l on l.fid = b.ffolkid                                                                          -- 民族\n");
         sb.append(" left join t_hrpi_empentrel m on m.fid = person.fempentrelid                                      -- 职业信息\n");
         sb.append(" left join t_hbss_laborrelstatus n on n.fid = m.flaborrelstatusid                                  -- 用工关系状态\n");
-        sb.append(" left join t_hrpi_empjobrel o on a.fid = o.fpersonid and o.fiscurrentversion  = '1' and fbusinessstatus = '1'    -- 职级职等 \n");
+        sb.append(" left join t_hrpi_empjobrel o on a.fid = o.fpersonid and o.fiscurrentversion  = '1' and o.fbusinessstatus = '1'    -- 职级职等 \n");
         sb.append(" left join t_hbjm_joblevel p on p.fjoblevelid = o.fjoblevelid  -- 职级 \n");
         sb.append(" left join t_hbss_enterprise q on q.fid = m.fenterpriseid   -- 用人单位 \n");
         sb.append(" left join tk_nckd_personproperty r on r.fid = b.fk_nckd_personproperty -- 个人性质 \n");
@@ -437,7 +437,7 @@ public class SyncUtil {
     public static StringBuilder getPersonPartTimeSql () {
         StringBuilder sb = new StringBuilder();
         sb.append("/*dialect*/ select a.fpersonId personId, \n");
-        sb.append("        pos.fid EMP_P_PRIMARY_KEY, \n");
+        sb.append("        case when a.fk_nckd_easid = ' ' then org.fid::varchar else a.fk_nckd_easid end EMP_P_PRIMARY_KEY,  \n");
         sb.append("        to_char(a.fstartdate,'yyyy-MM-dd') EMP_P_STARTDATE, \n");
         sb.append("        to_char(a.fenddate,'yyyy-MM-dd') EMP_P_ENDDATE, \n");
         sb.append("        '上海济煜' EMP_P_SUBCOMPANY, \n");