From 6d766b0c8e9b31e7e03ffd344a94c2851aa9beb9 Mon Sep 17 00:00:00 2001
From: DESKTOP-0K9VGFE\hp <pengkun@prec-tech.com>
Date: 星期五, 11 三月 2022 19:30:24 +0800
Subject: [PATCH] no message

---
 force-app/main/default/classes/NFM705Rest.cls |   27 +++++++++++++--------------
 1 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/force-app/main/default/classes/NFM705Rest.cls b/force-app/main/default/classes/NFM705Rest.cls
index ea52474..2396957 100644
--- a/force-app/main/default/classes/NFM705Rest.cls
+++ b/force-app/main/default/classes/NFM705Rest.cls
@@ -131,18 +131,12 @@
                 //     continue;
                 // }
                 meetingApprovedNoList.add(ged.MeetingApprovedNo);
-                if (String.isNotBlank(ged.Num)) {
-                    NumList.add(ged.Num);
-                }
+                // if (String.isNotBlank(ged.Num)) {
+                //     NumList.add(ged.Num);
+                // }
             }
             
             //Map<String,String> campaignMap = new Map<String,String>();
-            List<Campaign> campaignList = NumList.size() > 0 ? [select Id, 
-                                            Num__c, 
-                                            MeetingApprovedNo__c 
-                                        from Campaign 
-                                        where Num__c IN: NumList 
-                                        ] : new List<Campaign>();
             // for(Campaign temp : campaignList){
             //     campaignMap.put(temp.Num__c,temp.Id);
             // }
@@ -176,8 +170,8 @@
                 aca.StateMaster__c                  = ged.StateMaster;
                 aca.CityMaster__c                   = ged.CityMaster;
                 aca.WorkshopPlace__c                = ged.WorkshopPlace;
-                aca.HostName__c                     = ged.HostName;
-                aca.CooperatorCompany__c            = ged.CooperatorCompany;
+                aca.HostName__c                     = String.isBlank(ged.HostName) ? '鏃�' : ged.HostName;
+                aca.CooperatorCompany__c            = String.isBlank(ged.CooperatorCompany) ? '鏃�' : ged.CooperatorCompany;
                 aca.ConveningParticipantsNum__c     = ged.ConveningParticipantsNum;
                 aca.IsPaidToSponsor__c              = NFMUtil.getMapValue(transferMap, 'IsPaidToSponsor__c', string.valueof(ged.IsPaidToSponsor), iflog);
                 aca.SponsorshipCategory__c          = ged.SponsorshipCategory;
@@ -194,7 +188,8 @@
                     aca.Id = oldacfcMap.get(ged.MeetingApprovedNo).Id;
                     aca.Num__c = String.isBlank(aca.Num__c) ? oldacfcMap.get(ged.MeetingApprovedNo).Num__c : aca.Num__c; 
                 } 
-
+                NumList.add(aca.Num__c);
+                system.debug('NumList------------->'+NumList);
                 // 纭鐢宠浜�
                 System.debug('aca.Id: ' + aca.Id);
                 if (String.isBlank(aca.Id)) {
@@ -211,7 +206,12 @@
 
                 acaList.add(aca);
             }
-
+            List<Campaign> campaignList = NumList.size() > 0 ? [select Id, 
+                                            Num__c, 
+                                            MeetingApprovedNo__c 
+                                        from Campaign 
+                                        where Num__c IN: NumList 
+                                        ] : new List<Campaign>();
             // 鏌ユ壘鎵�鏈変汉
             if (user_nos != null && user_nos.size() > 0) {
                 users = [select Id, Employee_No__c from User where Employee_No__c in :user_nos];
@@ -234,7 +234,6 @@
             if (acaList.size() > 0) {
                 // 鍐欏叆鍐宠淇℃伅
                 upsert acaList;
-
                 // 鍏变韩鏉冮檺
                 SetSharing(users, acaList);
                 // 鑷姩鍒涘缓瀛︿細

--
Gitblit v1.9.1