From 0d5e86be0672e62989491f8f36176ca38204d119 Mon Sep 17 00:00:00 2001
From: 游畅 <youchang@prec-tech.com>
Date: 星期五, 29 四月 2022 17:17:20 +0800
Subject: [PATCH] 【P】【紧急优先对应-期初】人员职种变化对应

---
 force-app/main/default/classes/OdsToUserHandler.cls |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/force-app/main/default/classes/OdsToUserHandler.cls b/force-app/main/default/classes/OdsToUserHandler.cls
index 17cb5e7..3cb46a4 100644
--- a/force-app/main/default/classes/OdsToUserHandler.cls
+++ b/force-app/main/default/classes/OdsToUserHandler.cls
@@ -48,34 +48,35 @@
                 **/
                    if(String.isNotBlank(os.Employee_No__c) && os.Job_Type__c != '鍔冲姟-娲鹃仯' && os.Job_Type__c != '鍔冲姟-涓存椂' && os.Job_Type__c != '鏃�' && String.isNotBlank(os.Job_Type__c) && String.isNotBlank(os.Stay_or_not__c) && String.isNotBlank(os.Email__c))
                    {
-                        //鍒ゆ柇email銆佸憳宸ョ紪鐮併�佸悕绉般�丼tay_or_not鍜屽叆鑱屾棩鏈熸槸鍚︿负绌�  20220424 you 鏂板 寰呭叆鑱屼笉鍒涘缓涓嶆洿鏂皍ser
-                        if(os.Email__c != null && String.isNotBlank(os.Employee_No__c) && String.isNotBlank(os.Stay_or_not__c)&& os.Stay_or_not__c !='寰呭叆鑱�' &&String.isNotBlank(os.Name__c) && os.Hire_Date__c != null)
+                        //鍒ゆ柇email銆佸憳宸ョ紪鐮併�佸悕绉般�丼tay_or_not鍜屽叆鑱屾棩鏈熸槸鍚︿负绌�
+                        if(os.Email__c != null && String.isNotBlank(os.Employee_No__c) && String.isNotBlank(os.Stay_or_not__c) &&String.isNotBlank(os.Name__c) && os.Hire_Date__c != null)
                         {
                             //濡傛灉涓簎pdate锛岄偅涔堝垽鏂�兼槸鍚﹀彂鐢熷彉鍖�
                             //鍒ゆ柇鍊兼暟鎹彂鐢熷彉鍖�
                             if(Trigger.isUpdate){
-                                //涓嬮潰寰梚f鏄柊澧炲緱 20220422 you LLIU-CCY9TA 鏇存柊寰楁椂鍊欏彧鏈夊叆鑱屾棩鏈熷拰绂昏亴鏃ユ湡鏈夋洿鏂板湪鏇存柊锛屽叾浣欎竴寰嬩笉鏇存柊   鐘舵�佸彉鎴愬叆鑱屼篃鏇存柊
-                                if(os.LeaveDate__c != oldMap.get(os.id).LeaveDate__c || os.Hire_Date__c != oldMap.get(os.id).Hire_Date__c || (os.Stay_or_not__c != oldMap.get(os.id).Stay_or_not__c && os.Stay_or_not__c=='鍦ㄨ亴')){
                                     //缁熸嫭鏈儴銆佹湰閮ㄣ�侀儴銆佽銆佸憳宸ョ紪鐮併�佸叆鑱屾棩鏈熴�佺數瀛愰偖浠躲�佹墜鏈哄彿鐮併�佽亴浣嶃�佽亴绉嶃�佽礋璐d骇鍝侊紙涓伙級銆侀攢鍞伐浣滃唴瀹广�佸伐浣滃湴銆佸湪鑱�/宸茬鑱屻�佺鑱屾棩鏈�
                                     //浠ヤ笂瀛楁鐨勫�兼槸鍚﹀彂鐢熷彉鎹�
                                     //濡傛灉鍙戠敓鍙樺寲锛岄偅涔堟洿鏂皍ser琛ㄦ暟鎹紝user琛ㄦ洿鏂癱ontact琛ㄦ暟鎹�
+                                    //20220425 you 鑱屼綅鏀瑰悕鍙� 閫氱敤鑱岃 鍦ㄦ洿鏂扮殑鏃跺�欎篃浼氭帹鍒扮敤鎴蜂笂鐨� HR閫氱敤鑱岀骇
                                     if(os.Category3__c != oldMap.get(os.id).Category3__c || os.Category4__c != oldMap.get(os.id).Category4__c 
                                         || os.Category5__c != oldMap.get(os.id).Category5__c || os.Category6__c != oldMap.get(os.id).Category6__c 
                                         || os.Employee_No__c != oldMap.get(os.id).Employee_No__c || os.Hire_Date__c != oldMap.get(os.id).Hire_Date__c 
                                         || os.Email__c != oldMap.get(os.id).Email__c || os.MobilePhone__c != oldMap.get(os.id).MobilePhone__c 
-                                        || os.Post__c != oldMap.get(os.id).Post__c || os.Job_Category__c != oldMap.get(os.id).Job_Category__c 
+                                        || os.Job_Category__c != oldMap.get(os.id).Job_Category__c  || os.Post__c != oldMap.get(os.id).Post__c 
                                         || os.Product_specialist_incharge_product__c != oldMap.get(os.id).Product_specialist_incharge_product__c 
                                         || os.Sales_Speciality__c != oldMap.get(os.id).Sales_Speciality__c || os.Work_Location__c != oldMap.get(os.id).Work_Location__c
                                         || os.Stay_or_not__c != oldMap.get(os.id).Stay_or_not__c || os.LeaveDate__c != oldMap.get(os.id).LeaveDate__c 
                                         || os.Name__c != oldMap.get(os.Id).Name__c || os.Null_Update__c != oldMap.get(os.Id).Null_Update__c
+                                        //20220428 you LLIU-CDW5ZW start
+                                        || os.PositionSubsequence__c != oldMap.get(os.Id).PositionSubsequence__c 
+                                        //20220428 you LLIU-CDW5ZW end
                                         // SWAG-CBP5DY鐨勫巻鍙叉暟鎹娇鐢ㄧ┖鏇存柊澶勭悊 thh 20220224 start
                                         || (System.Label.onlyupdate == '1' && UserInfo.getUserId() == '00510000005sEEMAA2'))
                                         // SWAG-CBP5DY鐨勫巻鍙叉暟鎹娇鐢ㄧ┖鏇存柊澶勭悊 thh 20220224 end
                                         {
+                                        system.debug('jinlaileheheh'+os.Post__c +'===='+ oldMap.get(os.id).Post__c);
                                         employeeNoList.add(os.Employee_No__c.trim());
                                     }
-                                }
-                                
                             }else{
                                 employeeNoList.add(os.Employee_No__c.trim());
                             }

--
Gitblit v1.9.1