1.MDM人员同步代码优化，解决部分数据重复问题；

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

@@ -407,15 +407,15 @@ public class SyncUtil {
         sb.append(" left join t_hrpi_pertsprop c on a.fid = c.fpersonid and c.fiscurrentversion = '1' and c.fdatastatus = '1'           -- 时序\n");
         sb.append(" left join t_hrpi_perregion d on a.fid = d.fpersonid and d.fiscurrentversion = '1' and d.fdatastatus = '1'        -- 区域信息\n");
         sb.append(" left join t_hrpi_percontact e on a.fid = e.fpersonid and e.fiscurrentversion = '1' and e.fdatastatus = '1'      -- 联系方式\n");
-        sb.append(" inner join t_hrpi_empposorgrel f on f.fid = person.fempposrelid and f.fiscurrentversion = '1' and f.fisprimary = '1'   -- 任职经历\n");
-        sb.append(" left join t_hrpi_percre g on a.fid = g.fpersonid and g.fiscurrentversion = '1' and g.fcredentialstypeid = '1010'                    -- 证件信息 身份证\n");
-        sb.append(" left join t_hrpi_percre g1 on a.fid = g1.fpersonid and g1.fiscurrentversion = '1' and g1.fcredentialstypeid = '1020'           -- 证件信息 护照\n");
+        sb.append(" inner join t_hrpi_empposorgrel f on f.fid = person.fempposrelid and f.fiscurrentversion = '1' and f.fisprimary = '1' and f.fdatastatus = '1'  -- 任职经历\n");
+        sb.append(" left join t_hrpi_percre g on a.fid = g.fpersonid and g.fiscurrentversion = '1' and g.fcredentialstypeid = '1010' and g.fdatastatus = '1' -- 证件信息 身份证\n");
+        sb.append(" left join t_hrpi_percre g1 on a.fid = g1.fpersonid and g1.fiscurrentversion = '1' and g1.fcredentialstypeid = '1020' and g1.fdatastatus = '1' -- 证件信息 护照\n");
         sb.append(" left join t_hrpi_trialperiod h on a.fid = h.fpersonid and h.fiscurrentversion = '1' and h.fdatastatus = '1'      -- 试用期\n");
         sb.append(" left join t_haos_adminorg org on org.fid = f.fadminorgid                                             -- 所属部门\n");
         sb.append(" left join t_hbpm_position pos on pos.fid = f.fpositionid                                               -- 岗位\n");
         sb.append(" left join t_hbpm_position pos1 on pos1.fid = pos.fparentid                                          -- 上级岗位\n");
         sb.append(" left join t_hbss_sex sex on sex.fid = b.fgenderid                                                            -- 性别\n");
-        sb.append(" left join t_hrpi_baselocation t on t.fpersonid = a.fid and t.fiscurrentversion = '1' and t.fbusinessstatus = '1'  -- 常驻工作地\n ");
+        sb.append(" left join t_hrpi_baselocation t on t.fpersonid = a.fid and t.fiscurrentversion = '1' and t.fbusinessstatus = '1' and t.fdatastatus = '1'  -- 常驻工作地\n ");
         sb.append(" left join t_hbss_workplace wp on wp.fid = t.flocationId                                           -- 工作地点\n");
         sb.append(" left join t_hbss_nationality nation on nation.fid = b.fnationalityid                              -- 国籍\n");
         sb.append(" left join t_htm_quitfileinfo i on i.femployeeid = f.femployeeid and i.fquittypeid <> '1245492024325465088'  -- 离职档案 非退休 \n");
@@ -424,9 +424,9 @@ public class SyncUtil {
         sb.append(" left join t_htm_quitapplybill j1 on j1.fid = i1.fquitapplyid   -- 离职办理单 退休 \n");
         sb.append(" left join t_hrpi_perserlen k on a.fid = k.fpersonid and k.fiscurrentversion = '1' and k.fdatastatus = '1' -- 服务年限\n");
         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_hrpi_empentrel m on m.fid = person.fempentrelid and m.fdatastatus = '1' -- 职业信息\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 o.fbusinessstatus = '1'    -- 职级职等 \n");
+        sb.append(" left join t_hrpi_empjobrel o on a.fid = o.fpersonid and o.fiscurrentversion = '1' and o.fbusinessstatus = '1' and o.fdatastatus = '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");