From e3c02c03dd2de442bbced87236f60a13a1cd154e Mon Sep 17 00:00:00 2001
From: 高章伟 <gaozhangwei@prec-tech.com>
Date: 星期四, 02 三月 2023 17:51:57 +0800
Subject: [PATCH] gzw 正式环境最新代码更新
---
force-app/main/default/classes/TenderManageController.cls | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/force-app/main/default/classes/TenderManageController.cls b/force-app/main/default/classes/TenderManageController.cls
index 38a0d43..674d8a8 100644
--- a/force-app/main/default/classes/TenderManageController.cls
+++ b/force-app/main/default/classes/TenderManageController.cls
@@ -52,12 +52,24 @@
String query = 'SELECT id,status__c,NotBidApprovalStatus__c,ViewWaitConfirm__c,ViewRelatedOpp__c,ViewBidConfirm__c ';
query += 'FROM Tender_information__c ';
//寰呯‘璁�
- query += 'WHERE ( status__c = \'01.寰呯‘璁' AND ViewWaitConfirm__c = true ) ';
+ // 20221013 ljh SWAG-CK28WT update start
+ // query += 'WHERE ( status__c = \'01.寰呯‘璁' AND ViewWaitConfirm__c = true ) ';
+ query += 'WHERE (( status__c = \'01.寰呯‘璁' AND ViewWaitConfirm__c = true ) ';
//寰呭叧鑱旇浠�
query += 'OR ( status__c =\'04.寰呭叧鑱旇浠穃' AND ViewRelatedOpp__c = true ) ';
//寰呭簲鏍� zys 20210709 搴旀爣纭 鍙樹负 寰呭簲鏍囩‘璁�
- query += 'OR ( status__c = \'03.鏄惁搴旀爣\' AND NotBidApprovalStatus__c != \'鐢宠涓璡' ) ';
-
+ // query += 'OR ( status__c = \'03.鏄惁搴旀爣\' AND NotBidApprovalStatus__c != \'鐢宠涓璡' ) ';
+ query += 'OR ( status__c = \'03.鏄惁搴旀爣\' AND NotBidApprovalStatus__c != \'鐢宠涓璡' )) ';
+ // 20221013 ljh SWAG-CK28WT update end
+
+ // 20221013 ljh SWAG-CK28WT add start
+ String proId = UserInfo.getProfileId();
+ String p_2M4 = System.Label.ProfileId_2M4;
+ if(proId.substring(0,15) == p_2M4.substring(0,15)){
+ query += ' AND OwnerId =\''+UserInfo.getUserId()+'\'';
+ }
+ System.debug('query:'+query);
+ // 20221013 ljh SWAG-CK28WT add end
AllTender = Database.query(query);
return AllTender;
--
Gitblit v1.9.1