From a48ed9f335db52a433a2b343ff9636a28ee8a97f Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期四, 10 三月 2022 18:53:59 +0800
Subject: [PATCH] New xml file for PIPL20220310
---
force-app/main/default/classes/ControllerUtil.cls | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/classes/ControllerUtil.cls b/force-app/main/default/classes/ControllerUtil.cls
index ef5ec4c..d58e34c 100644
--- a/force-app/main/default/classes/ControllerUtil.cls
+++ b/force-app/main/default/classes/ControllerUtil.cls
@@ -2915,8 +2915,8 @@
// 鐜版湁鑱旂郴浜�
Map<String, Contact> conMap = new Map<String, Contact>();
// UserToContact 銇� 澶夋洿銇椼仧銇� 銇仸鍒ゆ柇銇椼仧闋呯洰銇с仚
- List<User> usrList = [select Id, Notes_File_Name__c,FirstName, LastName, Email, Mobile_Phone__c, Employee_No__c, Work_Location__c, Post__c, Job_Category__c, Hire_Date__c, Gender__c, Dept__c, Pregnant_Rest__c, Salesdepartment__c, Stay_or_not__c,IsMEBG__c from User where Employee_No__c IN :userEmployeeNoList];
- List<Contact> conList = [select Id,Notes_File_Name__c, User__c, Employee_No_manual__c,Isactive__c,IsMEBG__c from Contact where Employee_No_manual__c IN :userEmployeeNoList and RecordTypeId = :rtId];
+ List<User> usrList = [select Id, Notes_File_Name__c,FirstName, LastName, Email, Mobile_Phone__c, Employee_No__c, Work_Location__c, Post__c, Job_Category__c, Hire_Date__c, Gender__c, Dept__c, Pregnant_Rest__c, Salesdepartment__c, Stay_or_not__c,IsMEBG__c, Work_Location_HR__c from User where Employee_No__c IN :userEmployeeNoList];
+ List<Contact> conList = [select Id,Notes_File_Name__c, User__c, Employee_No_manual__c,Isactive__c,IsMEBG__c, Work_Location_HR__c from Contact where Employee_No_manual__c IN :userEmployeeNoList and RecordTypeId = :rtId];
for (Contact con : conList) {
//conMap.put(con.Employee_No_manual__c, con);
conMap.put(con.Employee_No_manual__c.toLowerCase(), con);
@@ -2951,6 +2951,9 @@
tmp.MobilePhone = local.Mobile_Phone__c;
tmp.Employee_No_manual__c = local.Employee_No__c;
tmp.Work_Location_manual__c = local.Work_Location__c;
+ //鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級鏀瑰彉鏇存柊鍒拌仈绯讳汉涓� thh 2022-02-16 start
+ tmp.Work_Location_HR__c = local.Work_Location_HR__c;
+ //鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級鏀瑰彉鏇存柊鍒拌仈绯讳汉涓� thh 2022-02-16 end
tmp.Post_picklist__c = local.Post__c;
tmp.Job_Category_picklist__c = local.Job_Category__c;
tmp.Hire_date_text__c = local.Hire_Date__c;
@@ -2977,6 +2980,10 @@
tmp.MobilePhone = local.Mobile_Phone__c;
tmp.Employee_No_manual__c = local.Employee_No__c;
tmp.Work_Location_manual__c = local.Work_Location__c;
+ //濡傛灉鏍规嵁HR淇℃伅鏂板缓鐢ㄦ埛,鍒欐妸HR淇℃伅鐨勫伐浣滃湴浼犵粰鐢ㄦ埛鐨勫伐浣滃湴鍜屽伐浣滃湴锛堜汉浜嬶級 thh 2022-02-16 start
+ tmp.Work_Location_HR__c = local.Work_Location__c;
+ tmp.Work_Location_picklist__c = local.Work_Location__c;
+ //濡傛灉鏍规嵁HR淇℃伅鏂板缓鐢ㄦ埛,鍒欐妸HR淇℃伅鐨勫伐浣滃湴浼犵粰鐢ㄦ埛鐨勫伐浣滃湴鍜屽伐浣滃湴锛堜汉浜嬶級 thh 2022-02-16 end
tmp.Post_picklist__c = local.Post__c;
tmp.Job_Category_picklist__c = local.Job_Category__c;
tmp.Hire_date_text__c = local.Hire_Date__c;
@@ -3092,7 +3099,9 @@
}
//userData.Product_specialist_incharge_product__c = odsc.Product_specialist_incharge_product__c;//璐熻矗浜у搧锛堜富锛�
//userData.Sales_Speciality__c = odsc.Sales_Speciality__c;//閿�鍞伐浣滃唴瀹�
- userData.Work_Location__c = odsc.Work_Location__c;//宸ヤ綔鍦�
+ //HR淇℃伅涓婄殑宸ヤ綔鍦版洿鏂板埌鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級涓� thh 2022-02-16 start
+ userData.Work_Location_HR__c = odsc.Work_Location__c;
+ //HR淇℃伅涓婄殑宸ヤ綔鍦版洿鏂板埌鐢ㄦ埛鐨勫伐浣滃湴锛堜汉浜嬶級涓� thh 2022-02-16 end
userData.Stay_or_not__c = odsc.Stay_or_not__c;//鍦ㄨ亴/宸茬鑱�
//鐢变簬user鏈変竴涓獙璇佽鍒欙紝濡傛灉鍊间负宸茬鑱岋紝閭ｄ箞PBI涓嶈兘涓簍rue锛屾墍浠ユ墜鍔ㄨ缃负false锛屽苟鎶奝BI瀵硅薄鐨勫�艰涓篺alse
if(userData.Stay_or_not__c == '宸茬鑱�' && userData.PBI_Enable__c){//PBI鏄惁鍚敤
@@ -3136,7 +3145,10 @@
userData.Null_Update__c = odsc.Null_Update__c;
userData.Product_specialist_incharge_product__c = odsc.Product_specialist_incharge_product__c;//璐熻矗浜у搧锛堜富锛�
userData.Sales_Speciality__c = odsc.Sales_Speciality__c;//閿�鍞伐浣滃唴瀹�
- userData.Work_Location__c = odsc.Work_Location__c;//宸ヤ綔鍦�
+ //濡傛灉鏍规嵁HR淇℃伅鏂板缓鐢ㄦ埛,鍒欐妸HR淇℃伅鐨勫伐浣滃湴浼犵粰鐢ㄦ埛鐨勫伐浣滃湴鍜屽伐浣滃湴锛堜汉浜嬶級 thh 2022-02-16 start
+ userData.Work_Location_HR__c = odsc.Work_Location__c;
+ userData.Work_Location__c = odsc.Work_Location__c;
+ //濡傛灉鏍规嵁HR淇℃伅鏂板缓鐢ㄦ埛,鍒欐妸HR淇℃伅鐨勫伐浣滃湴浼犵粰鐢ㄦ埛鐨勫伐浣滃湴鍜屽伐浣滃湴锛堜汉浜嬶級 thh 2022-02-16 end
userData.Stay_or_not__c = odsc.Stay_or_not__c;//鍦ㄨ亴/宸茬鑱�
userData.QuitDate__c = odsc.LeaveDate__c;//绂昏亴鏃ユ湡
userData.IsMEBG__c=true;//鏄惁MEBG
--
Gitblit v1.9.1