From 9909cdba659d1933abb3c63e9cc5dc7e719f90e6 Mon Sep 17 00:00:00 2001
From: sunxia <sunxia@prec-tech.com>
Date: 星期五, 11 三月 2022 14:30:34 +0800
Subject: [PATCH] OBPM 上线比较文件差异注释解开
---
force-app/main/default/classes/RentalFixtureSetAssignController.cls | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/RentalFixtureSetAssignController.cls b/force-app/main/default/classes/RentalFixtureSetAssignController.cls
index eb01f41..85dabea 100644
--- a/force-app/main/default/classes/RentalFixtureSetAssignController.cls
+++ b/force-app/main/default/classes/RentalFixtureSetAssignController.cls
@@ -296,7 +296,10 @@
Rental_Apply__c raUpd = [
SELECT Id, Shipment_request_Cnt__c,
Asset_loaner_start_day__c,
- Asset_loaner_closed_day__c
+ Asset_loaner_closed_day__c,
+ Campaign__c,
+ Campaign__r.IF_Approved__c,
+ Campaign__r.Meeting_Approved_No__c
FROM Rental_Apply__c
WHERE Id = :parentId
FOR Update];
@@ -311,6 +314,11 @@
}
}
+ //20220228 sx obpm淇敼 鏄惁鐢宠鍐宠鍕剧潃娌℃湁鍐宠缂栧彿涓嶈兘杩涜鎿嶄綔
+ if( raUpd.Campaign__c!= null && raUpd.Campaign__r.IF_Approved__c && raUpd.Campaign__r.Meeting_Approved_No__c == null){
+ throw new ControllerUtil.myException('宸茬敵璇峰喅瑁佷絾鍐宠缂栫爜涓虹┖');
+ }
+
Integer indexNum = 1;
// 20210708 ljh SFDC-C47CLV add start
Set<Id> raeIdset = new Set<Id>();
@@ -322,6 +330,7 @@
raeIdset.add(robj.Id);
}
}
+
List<Rental_Apply_Equipment_Set__c> raeList = [SELECT Id, Name,Rental_Apply__c,Cancel_Select__c,LastModifiedDate FROM Rental_Apply_Equipment_Set__c where Id in :raeIdset];
// 20210906 ljh SFDC-C6D9C2 add LastModifiedDate
for(Rental_Apply_Equipment_Set__c rae:raeList){
@@ -344,6 +353,7 @@
hasError = true;
throw new ControllerUtil.myException('绗�' + indexNum +'琛屾暟鎹凡琚垎鍓茬敵璇峰崟锛岃鍒锋柊鍚庨噸璇曪紒');
}
+
// 20210708 ljh update end
// 20210906 ljh SFDC-C6D9C2 add start
// 20210929 ljh SFDC-C6D9C2 娉ㄩ噴 鎭㈠鏀瑰叾浠栨柟妗� start
@@ -1536,6 +1546,7 @@
return result;
}
+
public static List<String> transferStringToList(String str){
// System.debug(LoggingLevel.INFO, '*** str: ' + str);
List<String> strList = new List<String>();
@@ -1544,6 +1555,11 @@
}else{
strList.add(str);
}
+ for(Integer i = strList.size()-1;i >= 0 ; i --){
+ if(String.isEmpty(strList.get(i))){
+ strList.remove(i);
+ }
+ }
return strList;
}
--
Gitblit v1.9.1