| 
														
															@@ -33,6 +33,8 @@ import java.util.stream.Stream; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  * 组织变动数据同步MDM 
														 | 
														
														 | 
														
															  * 组织变动数据同步MDM 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  * 1.组织名称变化/组织调整时,需要把该组织下所有岗位及人员也传给MDM 
														 | 
														
														 | 
														
															  * 1.组织名称变化/组织调整时,需要把该组织下所有岗位及人员也传给MDM 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  * 2.其余变化时,只需要传递组织信息,岗位人员不需要 
														 | 
														
														 | 
														
															  * 2.其余变化时,只需要传递组织信息,岗位人员不需要 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ * 2025-06-14 Tyx 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+ * 去除只变化排序码的情况,MDM中不需要排序码,避免MDM生成伪版本 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  */ 
														 | 
														
														 | 
														
															  */ 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 public class SyncAdminOrgTask extends AbstractTask implements Plugin { 
														 | 
														
														 | 
														
															 public class SyncAdminOrgTask extends AbstractTask implements Plugin { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															  
														 | 
														
														 | 
														
															  
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -62,7 +64,7 @@ public class SyncAdminOrgTask extends AbstractTask implements Plugin { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             JSONObject personOb = new JSONObject(); 
														 | 
														
														 | 
														
															             JSONObject personOb = new JSONObject(); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             initDateRange(map); 
														 | 
														
														 | 
														
															             initDateRange(map); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             HRBaseServiceHelper helper = new HRBaseServiceHelper(orgChgRecord_entity); 
														 | 
														
														 | 
														
															             HRBaseServiceHelper helper = new HRBaseServiceHelper(orgChgRecord_entity); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															-            String selectProperties = "adminorg,orgchgentry.changescene.number,orgchgentry.operationtime"; 
														 | 
														
														 | 
														
															 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            String selectProperties = "adminorg,orgchgentry.changescene.number,orgchgentry.operationtime,orgchgentry.subentryentity.chgpageelement"; 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             //查出发生过变化的组织 
														 | 
														
														 | 
														
															             //查出发生过变化的组织 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             DynamicObjectCollection changeOperateCol = helper.queryOriginalCollection(selectProperties, this.getQFilters()); 
														 | 
														
														 | 
														
															             DynamicObjectCollection changeOperateCol = helper.queryOriginalCollection(selectProperties, this.getQFilters()); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             //查询出来为空直接返回 
														 | 
														
														 | 
														
															             //查询出来为空直接返回 
														 | 
													
												
											
										
											
												
													
														 | 
														
															@@ -364,6 +366,7 @@ public class SyncAdminOrgTask extends AbstractTask implements Plugin { 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 
														 | 
														
														 | 
														
															             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             QFilter filter = new QFilter("orgchgentry.operationtime", ">=", sdf.parse(startTime)); 
														 | 
														
														 | 
														
															             QFilter filter = new QFilter("orgchgentry.operationtime", ">=", sdf.parse(startTime)); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             filter.and("orgchgentry.operationtime", "<", sdf.parse(endTime)); 
														 | 
														
														 | 
														
															             filter.and("orgchgentry.operationtime", "<", sdf.parse(endTime)); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															 
														 | 
														
														 | 
														
															+            filter.and("orgchgentry.subentryentity.chgpageelement", QCP.not_equals2, "index"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             //filter.and("org.otclassify", "=", 1010L); 
														 | 
														
														 | 
														
															             //filter.and("org.otclassify", "=", 1010L); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             //filter.and("adminorg.number", QCP.equals, "JY-20240612-0009"); 
														 | 
														
														 | 
														
															             //filter.and("adminorg.number", QCP.equals, "JY-20240612-0009"); 
														 | 
													
												
											
												
													
														| 
														 | 
														
															             log.info("-------- 查询组织变化过滤条件:" + filter.toString() + " --------"); 
														 | 
														
														 | 
														
															             log.info("-------- 查询组织变化过滤条件:" + filter.toString() + " --------"); 
														 |