From 2f4492ee18f90274582fcc2bb06f5e9bf64136e8 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 13 五月 2022 17:32:14 +0800
Subject: [PATCH] ProdBackup0513

---
 force-app/main/default/classes/AccountTriggerHandler.cls |   43 +++++++++++++++++++++++--------------------
 1 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/force-app/main/default/classes/AccountTriggerHandler.cls b/force-app/main/default/classes/AccountTriggerHandler.cls
index 63f44a9..194ddb3 100644
--- a/force-app/main/default/classes/AccountTriggerHandler.cls
+++ b/force-app/main/default/classes/AccountTriggerHandler.cls
@@ -36,7 +36,7 @@
 
             //鏂板鏉冮檺鏁寸悊2021-05-10
             if (new_profileId.subString(0, 15) == System.label.Market_Department || new_profileId.subString(0, 15) == System.label.Market_Department1 || new_profileId.subString(0, 15) == System.label.Service_Owner || new_profileId.subString(0, 15) == System.label.Service_OwnerMinister 
-                    || UserInfo.getUserType() == 'PowerPartner' || new_profileId.subString(0, 15) == System.label.IEPrototypeManager || newAcc.RecordTypeId == '0120T0000003Cxt') {
+                    || UserInfo.getUserType() == 'PowerPartner' || new_profileId.subString(0, 15) == System.label.IEPrototypeManager) {
             //鏂板鏉冮檺鏁寸悊2021-05-10
                 newAcc.IsNew__c = true;
             } else {
@@ -91,7 +91,7 @@
                 //IE涓嶭S鍒嗛噹鐨勫鍔犱笌淇敼
                 newAcc.Sub_UseA__c = newAcc.Sub_Use1__c;
                 newAcc.Sub_UseD__c = newAcc.Sub_Use__c;
-                newAcc.IndustryBD__c = newAcc.IndustryB__c;
+                //newAcc.IndustryBD__c = newAcc.IndustryB__c;
                
                 //IE涓嶭S鍒嗛噹鐨勫鍔犱笌淇敼
                 newAcc.UseD__c = newAcc.Use__c;
@@ -113,9 +113,9 @@
                
             }
             //gwy 2021-06-04 LS 鏂板蹇呭~椤筄EM瀹㈡埛鐨勬爣璇�
-            if(newAcc.UserType__c == 'OEM瀹㈡埛' && newAcc.ProductSegment__c == 'BS'){
+            /*if(newAcc.UserType__c == 'OEM瀹㈡埛' && newAcc.ProductSegment__c == 'BS'){
                 newAcc.Whether_OEM__c = true;
-            }
+            }*/
             //鐜嬮箯浼熸坊鍔� 鏈嶅姟閮ㄥ垱寤哄鎴枫�佽仈绯讳汉
             //00528000000YWC6 瀛� 瀛︽磱 00528000000YWC6
             //00528000000YWE7 鍚� 鏅撲笢 00528000000YWE7
@@ -895,7 +895,7 @@
             //         } else if (newAcc.Sub_Use__c == '鐐奸挗鍘�') {
             //             newAcc.IndustryC__c = 'Metal Manufacturing';
             //             newAcc.MarketVerticals__c = 'Manufacturing';
-            //             newAcc.Use__c = '  Tube/Rod/Bar/Sheet Metal';
+            //             newAcc.Use__c = '   Tube/Rod/Bar/Sheet Metal';
             //         } else if (newAcc.Sub_Use__c == 'PMI-鐭冲寲琛屼笟') {
             //             newAcc.IndustryC__c = 'Chemical/Petrochemical/Plastics';
             //             newAcc.MarketVerticals__c = 'Maintenance';
@@ -1013,7 +1013,7 @@
                     newAcc.AssetNDT4D__c != oldAcc.AssetNDT4D__c ||
                     newAcc.IndustryCD__c != oldAcc.IndustryCD__c ||
                     //gwy BS
-                    newAcc.IndustryBD__c != oldAcc.IndustryBD__c ||
+                    //newAcc.IndustryBD__c != oldAcc.IndustryBD__c ||
                     newAcc.AssetRVI4D__c != oldAcc.AssetRVI4D__c ||
                     newAcc.AssetRVI3D__c != oldAcc.AssetRVI3D__c ||
                     //newAcc.KeyAccountD__c != oldAcc.KeyAccountD__c ||
@@ -1069,11 +1069,9 @@
                 //鐜嬮箯浼� 娣诲姞&&((oldCon.ProductSegmentIE__c == true || oldCon.ProductSegmentRVI__c == true) && oldCon.isServiceCreate__c == true)
                 //鏈嶅姟閮ㄤ慨鏀硅仈绯讳汉淇℃伅 LS銆丯DT銆丄NI鏃犻渶瀹℃壒璺宠繃瀹℃壒鐘舵�佸彉鑽夋
                 //鏂板鏉冮檺鏁寸悊2021-05-10
-                //gwy 2021-08-20 闄や簡甯傚満閮ㄧ殑浜猴紝閮藉彲浠ュ彉鑽夋
-                //List<String> markNot = new String [] {'00528000000YVIc','0050K00000B3aNb','0050K00000B3aN7','00528000001uK0Z','00528000000YVHy','00528000000YVID'};
-                if ((oldAcc.MarkisorNo__c == false
-                        //鏂板鏉冮檺鏁寸悊2021-05-10 
-                        || UserInfo.getUserType() == 'PowerPartner')
+                if ((new_profileId.subString(0, 15) == System.label.Service_Owner
+                        //鏂板鏉冮檺鏁寸悊2021-05-10
+                        || UserInfo.getUserType() == 'PowerPartner' || now_userId == '00528000000YWC6' || now_userId == '00528000000YWE7')
                         && !((oldAcc.ProductSegment__c == 'BS' || oldAcc.ProductSegment__c == 'NDT' || oldAcc.ProductSegment__c == 'ANI') && oldAcc.serviceCreate__c == true)) {
                     newAcc.stautesD__c = 'Draft';
                 }
@@ -1120,9 +1118,9 @@
                 newAcc.AssetNDT4D__c = newAcc.AssetNDT4__c;
             }
             //gwy BS
-            if (newAcc.IndustryB__c != oldAcc.IndustryB__c) {
+            /*if (newAcc.IndustryB__c != oldAcc.IndustryB__c) {
                 newAcc.IndustryBD__c = newAcc.IndustryB__c;
-            }
+            }*/
             if (newAcc.IndustryC__c != oldAcc.IndustryC__c) {
                 newAcc.IndustryCD__c = newAcc.IndustryC__c;
             }
@@ -1265,7 +1263,7 @@
                 newAcc.DepartmentNameD__c = newAcc.DepartmentName__c;
             }
             //gwy 2021-06-08 瀹㈡埛鍙栨秷閭紪蹇呭~椤�
-           /* if (newAcc.PostCodeD__c == null) {
+            /*if (newAcc.PostCodeD__c == null) {
                 newAcc.PostCodeD__c = '000000';
             }*/
             //鐜嬮箯浼熸柊鍔� 鏈嶅姟閮ㄥ垱寤哄鎴疯仈绯讳汉
@@ -1531,8 +1529,8 @@
                     newAcc.AssetRVI2D__c = newAcc.AssetRVI2__c;
                     newAcc.AssetNDT4D__c = newAcc.AssetNDT4__c;
                     //gwy 2021-06-15 鏇存敼
-                    newAcc.IndustryBD__c = newAcc.IndustryB__c;
-                    newAcc.IndustryCD__c = newAcc.IndustryC__c;
+                    //newAcc.IndustryBD__c = newAcc.IndustryB__c;
+                    //newAcc.IndustryCD__c = newAcc.IndustryC__c;
                     //newAcc.IndustryCD__c = newAcc.IndustryB__c;
                     //newAcc.IndustryBD__c = newAcc.IndustryB__c;
                     newAcc.AssetRVI4D__c = newAcc.AssetRVI4__c;
@@ -1585,11 +1583,11 @@
                 }
             }
             //gwy 2021-06-04 LS 鏂板蹇呭~椤筄EM瀹㈡埛鐨勬爣璇�
-            if(newAcc.UserType__c == 'OEM瀹㈡埛' && newAcc.ProductSegment__c == 'BS'){
+            /*if(newAcc.UserType__c == 'OEM瀹㈡埛' && newAcc.ProductSegment__c == 'BS'){
                 newAcc.Whether_OEM__c = true;
             }else{
                 newAcc.Whether_OEM__c = false;
-            }
+            }*/
         }
     }
 
@@ -1635,7 +1633,10 @@
         for (Account newAcc : newList) {
 
             accIdList.add(newAcc.Id);
-            String dealerId = userMap.get(newAcc.OwnerId);
+            // String dealerId = userMap.get(newAcc.OwnerId);
+            // 鎵嬪姩瀵煎叆瀹㈡埛 XHL 20210818 
+            String dealerId = String.isNotBlank(newAcc.ImportDealerId__c)? newAcc.ImportDealerId__c:userMap.get(newAcc.OwnerId);
+
             String groupId = StaticParameter.dealerGroupMap.get(dealerId == null ? '' : dealerId.substring(0, 15));
             Boolean flag = StaticParameter.specialDealerList.contains(dealerId == null ? '' : dealerId.substring(0, 15));
             if (flag) {
@@ -1651,7 +1652,9 @@
 
         List<AccountTeamMember> insertList = new list<AccountTeamMember>();
         for (Account newAcc : newList) {
-            String dealerId = userMap.get(newAcc.OwnerId);
+            // String dealerId = userMap.get(newAcc.OwnerId);
+            // 鎵嬪姩瀵煎叆瀹㈡埛 XHL 20210818 
+            String dealerId = String.isNotBlank(newAcc.ImportDealerId__c)? newAcc.ImportDealerId__c:userMap.get(newAcc.OwnerId);
             String groupId = StaticParameter.dealerGroupMap.get(dealerId == null ? '' : dealerId.substring(0, 15));
             // 甯傚満鎴樼暐閮ㄦ柊寤轰繚瀛樻椂灏嗗垱寤鸿�呮彃鍏ュ鎴峰皬缁�
             if (newAcc.IsStrCreated__c == true) {

--
Gitblit v1.9.1