From 29ec8b29f26b7d4b92cc75820ca7988d464c0185 Mon Sep 17 00:00:00 2001
From: 黄千龙 <huangqianlong@prec-tech.com>
Date: 星期二, 29 三月 2022 13:39:07 +0800
Subject: [PATCH] Merge branch 'master' of http://47.92.229.245:8089/r/OlyMEBG
---
force-app/main/default/classes/NFM705Rest.cls | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 deletions(-)
diff --git a/force-app/main/default/classes/NFM705Rest.cls b/force-app/main/default/classes/NFM705Rest.cls
index ea52474..ee72525 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,10 @@
aca.Id = oldacfcMap.get(ged.MeetingApprovedNo).Id;
aca.Num__c = String.isBlank(aca.Num__c) ? oldacfcMap.get(ged.MeetingApprovedNo).Num__c : aca.Num__c;
}
-
+ if (String.isNotBlank(aca.Num__c)) {
+ NumList.add(aca.Num__c);
+ }
+ system.debug('NumList------------->'+NumList);
// 纭鐢宠浜�
System.debug('aca.Id: ' + aca.Id);
if (String.isBlank(aca.Id)) {
@@ -211,10 +208,16 @@
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];
+ // 2022-03-23 绱ф�ヤ慨澶� 鏈惎鐢ㄧ殑鐢ㄦ埛鏃犳硶璁剧疆鍏变韩
+ users = [select Id, Employee_No__c from User where Employee_No__c in :user_nos and IsActive = true];
if (users != null && users.size() > 0) {
String owner = '';
for (Application_for_Conference_Adjudication__c app : acaList) {
@@ -234,7 +237,6 @@
if (acaList.size() > 0) {
// 鍐欏叆鍐宠淇℃伅
upsert acaList;
-
// 鍏变韩鏉冮檺
SetSharing(users, acaList);
// 鑷姩鍒涘缓瀛︿細
@@ -510,6 +512,8 @@
}
// 鍐嶆柊澧�
if (insert_list != null && insert_list.size() > 0) {
+ System.debug('insert_list is: ');
+ System.debug(insert_list);
insert insert_list;
}
}
--
Gitblit v1.9.1