From b3dc8e8ce0a120b4f484ef787abd21832c40ec63 Mon Sep 17 00:00:00 2001
From: 彭锟 <pengkun@prec-tech.com>
Date: 星期日, 24 四月 2022 10:07:34 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/OdsToUserHandler.cls | 68 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/force-app/main/default/classes/OdsToUserHandler.cls b/force-app/main/default/classes/OdsToUserHandler.cls
index 0480084..beb8d51 100644
--- a/force-app/main/default/classes/OdsToUserHandler.cls
+++ b/force-app/main/default/classes/OdsToUserHandler.cls
@@ -42,39 +42,49 @@
//鐢ㄤ簬瀛樻斁瑙﹀彂trigger鐨刼ds鏁版嵁鐨勫憳宸ョ紪鍙�
List<String> employeeNoList = new List<String>();
for (ODS__c os : newList) {
- 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鍜屽叆鑱屾棩鏈熸槸鍚︿负绌�
- 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){
- //缁熸嫭鏈儴銆佹湰閮ㄣ�侀儴銆佽銆佸憳宸ョ紪鐮併�佸叆鑱屾棩鏈熴�佺數瀛愰偖浠躲�佹墜鏈哄彿鐮併�佽亴浣嶃�佽亴绉嶃�佽礋璐ｄ骇鍝侊紙涓伙級銆侀攢鍞伐浣滃唴瀹广�佸伐浣滃湴銆佸湪鑱�/宸茬鑱屻�佺鑱屾棩鏈�
- //浠ヤ笂瀛楁鐨勫�兼槸鍚﹀彂鐢熷彉鎹�
- //濡傛灉鍙戠敓鍙樺寲锛岄偅涔堟洿鏂皍ser琛ㄦ暟鎹紝user琛ㄦ洿鏂癱ontact琛ㄦ暟鎹�
- 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.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
- // SWAG-CBP5DY鐨勫巻鍙叉暟鎹娇鐢ㄧ┖鏇存柊澶勭悊 thh 20220224 start
- || (System.Label.onlyupdate == '1' && UserInfo.getUserId() == '00510000005sEEMAA2'))
- // SWAG-CBP5DY鐨勫巻鍙叉暟鎹娇鐢ㄧ┖鏇存柊澶勭悊 thh 20220224 end
- {
+ //20220407 LLIU-CCY9TA you 涓存椂鏇存柊鍑犱釜user
+ /** 20220422 杩愯4鏈�1鏃ヨ捣鏂板叆鑱屼汉鍛樺拰绂昏亴浜哄憳淇℃伅 you ,鎵�浠ユ敞閲婃帀 鏀瑰湪涓嬮潰鍔爄f浜�
+ if(String.isNotBlank(os.Employee_No__c) && System.Label.OdsToUserEmployee_No.contains(os.Employee_No__c)){
+ **/
+ 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鍜屽叆鑱屾棩鏈熸槸鍚︿负绌�
+ 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 ){
+ //缁熸嫭鏈儴銆佹湰閮ㄣ�侀儴銆佽銆佸憳宸ョ紪鐮併�佸叆鑱屾棩鏈熴�佺數瀛愰偖浠躲�佹墜鏈哄彿鐮併�佽亴浣嶃�佽亴绉嶃�佽礋璐ｄ骇鍝侊紙涓伙級銆侀攢鍞伐浣滃唴瀹广�佸伐浣滃湴銆佸湪鑱�/宸茬鑱屻�佺鑱屾棩鏈�
+ //浠ヤ笂瀛楁鐨勫�兼槸鍚﹀彂鐢熷彉鎹�
+ //濡傛灉鍙戠敓鍙樺寲锛岄偅涔堟洿鏂皍ser琛ㄦ暟鎹紝user琛ㄦ洿鏂癱ontact琛ㄦ暟鎹�
+ 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.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
+ // SWAG-CBP5DY鐨勫巻鍙叉暟鎹娇鐢ㄧ┖鏇存柊澶勭悊 thh 20220224 start
+ || (System.Label.onlyupdate == '1' && UserInfo.getUserId() == '00510000005sEEMAA2'))
+ // SWAG-CBP5DY鐨勫巻鍙叉暟鎹娇鐢ㄧ┖鏇存柊澶勭悊 thh 20220224 end
+ {
+ employeeNoList.add(os.Employee_No__c.trim());
+ }
+ }
+
+ }else{
employeeNoList.add(os.Employee_No__c.trim());
}
}else{
- employeeNoList.add(os.Employee_No__c.trim());
+ System.debug('--------------Email__c:'+os+'----Employee_No__c:'+os.Employee_No__c+'-----Stay_or_not__c:'+os.Stay_or_not__c+'-------Name__c:'+os.Name__c+'--------Hire_Date__c:'+os.Hire_Date__c+' 涓虹┖');
}
- }else{
- System.debug('--------------Email__c:'+os+'----Employee_No__c:'+os.Employee_No__c+'-----Stay_or_not__c:'+os.Stay_or_not__c+'-------Name__c:'+os.Name__c+'--------Hire_Date__c:'+os.Hire_Date__c+' 涓虹┖');
- }
- }
+ }
+ /** }**/
+
}
System.debug(employeeNoList.size()+'----------------------ods鍛樺伐缂栧彿--'+employeeNoList);
--
Gitblit v1.9.1