1.MDM同步问题修复

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/haos/staff/plugin/task/SyncAdminOrgTask.java

@@ -116,13 +116,13 @@ public class SyncAdminOrgTask extends AbstractTask implements Plugin {
                 //组织下级岗位同步：
                 if(posOb.getJSONArray("obj").size() > 0) {
                     url = SyncUtil.getUrl("position_url");
-                    SyncUtil.batchPost(url, ob, SyncUtil.SyncOrg_Position, startTime, endTime);
+                    SyncUtil.batchPost(url, posOb, SyncUtil.SyncOrg_Position, startTime, endTime);
                 }
 
                 //组织下级员工同步：
                 if(personOb.getJSONArray("obj").size() > 0) {
                     url = SyncUtil.getUrl("person_url");
-                    SyncUtil.batchPost(url, ob, SyncUtil.SyncOrg_Person, startTime, endTime);
+                    SyncUtil.batchPost(url, personOb, SyncUtil.SyncOrg_Person, startTime, endTime);
                 }
             }
         } catch (ParseException e) {
@@ -152,7 +152,8 @@ public class SyncAdminOrgTask extends AbstractTask implements Plugin {
             //组织名称
             data.put("MD_DESCRIPTION", org.getString("name"));
             //上级行政组织ID 看是否有easid 有就传EASID 否则传星瀚ID
-            data.put("ADM_PARENT_NUMER", org.getString("parentorg.nckd_easid"));
+            String parent_primary_key = StringUtils.isBlank(org.getString("parentorg.nckd_easid")) ? String.valueOf(org.getLong("parentorg.id")) : org.getString("parentorg.nckd_easid");
+            data.put("ADM_PARENT_NUMER", parent_primary_key);
             //上级组织名称
             data.put("ADM_PARENT_NAME", org.getString("parentorg.name"));
             //行政组织长名称 orglongname没值 去平台那边取

code/jyyy/nckd-jimin-jyyy-hr/src/main/java/nckd/jimin/jyyy/hr/haos/staff/plugin/task/SyncPersonTask.java

@@ -112,7 +112,8 @@ public class SyncPersonTask extends AbstractTask implements Plugin {
         sb.append("   (to_char(g.fmodifytime,'yyyy-MM-dd hh24:mi:ss') <= '"+endTime+"' and to_char(g.fmodifytime,'yyyy-MM-dd hh24:mi:ss') >=  '"+startTime+"' ) or \n");
         sb.append("   (to_char(g1.fmodifytime,'yyyy-MM-dd hh24:mi:ss') <= '"+endTime+"' and to_char(g1.fmodifytime,'yyyy-MM-dd hh24:mi:ss') >=  '"+startTime+"' ) or \n");
         sb.append("   (to_char(h.fmodifytime,'yyyy-MM-dd hh24:mi:ss') <= '"+endTime+"' and to_char(h.fmodifytime,'yyyy-MM-dd hh24:mi:ss') >=  '"+startTime+"' ) or \n");
-        sb.append("   (to_char(m.fmodifytime,'yyyy-MM-dd hh24:mi:ss') <= '"+endTime+"' and to_char(m.fmodifytime,'yyyy-MM-dd hh24:mi:ss') >=  '"+startTime+"' ) \n");
+        sb.append("   (to_char(m.fmodifytime,'yyyy-MM-dd hh24:mi:ss') <= '"+endTime+"' and to_char(m.fmodifytime,'yyyy-MM-dd hh24:mi:ss') >=  '"+startTime+"' ) or \n");
+        sb.append("   (a.fid in (select fpersonid from t_hrpi_ermanfile where to_char(fmodifytime,'yyyy-MM-dd hh24:mi:ss') <= '"+endTime+"' and to_char(fmodifytime,'yyyy-MM-dd hh24:mi:ss') >= '"+startTime+"')) \n");
         sb.append("   )");
         log.info("-------- 查询人员sql :" + sb.toString() + " -------- ");
         DataSet dataSet = DB.queryDataSet(this.getClass().getName(), DBRoute.of("hr"), sb.toString());