From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/classes/LexConsumableOrderManageController.cls | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/classes/LexConsumableOrderManageController.cls b/force-app/main/default/classes/LexConsumableOrderManageController.cls
index 2ead3f4..1b280f4 100644
--- a/force-app/main/default/classes/LexConsumableOrderManageController.cls
+++ b/force-app/main/default/classes/LexConsumableOrderManageController.cls
@@ -56,8 +56,13 @@
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();
@@ -125,7 +130,15 @@
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 {
@@ -143,7 +156,15 @@
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 {
@@ -332,4 +353,8 @@
@AuraEnabled
public String fieldName;
}
-}
\ No newline at end of file
+<<<<<<< HEAD
+}
+=======
+}
+>>>>>>> LEXCommunityLiJun
--
Gitblit v1.9.1