OlyMEBG.git - Gitblit

			@@ -56,13 +56,8 @@
			List<CusCol> cols = new List<CusCol>();
			for (FieldSetMember fsm : fsmList) {
			//add by Link
			<<<<<<< HEAD
			if (fsm.getFieldPath() == 'Order_ForHospital__c' && agencyProType == 'ET') {
			} else {
			=======
			if(fsm.getFieldPath() == 'Order_ForHospital__c' && agencyProType == 'ET'){
			}else {
			>>>>>>> LEXCommunityLiJun
			CusCol col = new CusCol();
			col.label = fsm.getLabel();
			col.fieldName = fsm.getFieldPath();
			@@ -130,15 +125,7 @@
			raesList = Database.query(soql);
			//add by rentx 2021-3-10 start
			//为 hasHop 赋值判断当前经销商下是否有特价医院
			<<<<<<< HEAD
			List<hospitalprice__c> hopList = [
			SELECT id, hospital__c
			FROM hospitalprice__c
			WHERE account__c = :accountid
			];
			=======
			List<hospitalprice__c> hopList = [SELECT id, hospital__c FROM hospitalprice__c WHERE account__c = :accountid];
			>>>>>>> LEXCommunityLiJun
			if (hopList == null \|\| hopList.size() == 0) {
			hasHop = false;
			} else {
			@@ -156,15 +143,7 @@
			for (Account acc : contractList) {
			dealIds.add(acc.Id);
			}
			<<<<<<< HEAD
			List<Dealer_Product__c> deList = [
			SELECT id
			FROM Dealer_Product__c
			WHERE Dealer_Contact__c IN :dealIds
			];
			=======
			List<Dealer_Product__c> deList = [SELECT id FROM Dealer_Product__c WHERE Dealer_Contact__c IN :dealIds];
			>>>>>>> LEXCommunityLiJun
			if (deList == null \|\| deList.size() == 0) {
			hasSpecial = false;
			} else {
			@@ -353,8 +332,4 @@
			@AuraEnabled
			public String fieldName;
			}
			<<<<<<< HEAD
			}
			=======
			}
			>>>>>>> LEXCommunityLiJun